Skip to content
This repository was archived by the owner on Dec 6, 2022. It is now read-only.

Commit c5ec693

Browse files
author
Isaac Hollander McCreery
committed
[shindo-minitest] convert UrlMaps tests to minitest, including a few bug fixes in the implementation of UrlMaps
1 parent 1a141a3 commit c5ec693

File tree

4 files changed

+37
-3
lines changed

4 files changed

+37
-3
lines changed

lib/fog/google/models/compute/url_map.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class UrlMap < Fog::Model
88

99
attribute :kind, :aliases => 'kind'
1010
attribute :creationTimestamp, :aliases => 'creation_timestamp'
11-
attribute :defaultService, :aliases => 'default_service'
11+
attribute :defaultService, :aliases => ['default_service', :default_service]
1212
attribute :description, :aliases => 'description'
1313
attribute :fingerprint, :aliases => 'fingerprint'
1414
attribute :hostRules, :aliases => 'host_rules'

lib/fog/google/models/compute/url_maps.rb

+5-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,11 @@ def all
1313
end
1414

1515
def get(identity)
16-
response = service.get_url_map(identity)
17-
new(response.body) unless response.nil?
16+
if url_map = service.get_url_map(identity).body
17+
new(url_map)
18+
end
19+
rescue Fog::Errors::NotFound
20+
nil
1821
end
1922
end
2023
end

test/factories/url_maps_factory.rb

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
require "factories/collection_factory"
2+
require "factories/backend_services_factory"
3+
4+
class UrlMapsFactory < CollectionFactory
5+
def initialize(example)
6+
@backend_services = BackendServicesFactory.new(example)
7+
super(Fog::Compute[:google].url_maps, example)
8+
end
9+
10+
def cleanup
11+
super
12+
@backend_services.cleanup
13+
end
14+
15+
def params
16+
params = {:name => resource_name,
17+
:default_service => @backend_services.create.self_link}
18+
end
19+
end
+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
require "minitest_helper"
2+
require "helpers/test_collection"
3+
require "factories/url_maps_factory"
4+
5+
class TestUrlMaps < FogIntegrationTest
6+
include TestCollection
7+
8+
def setup
9+
@subject = Fog::Compute[:google].url_maps
10+
@factory = UrlMapsFactory.new(namespaced_name)
11+
end
12+
end

0 commit comments

Comments
 (0)