alinta-testing 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f18e3e866d81783ed06d2dc1fcdf218df473ef2014facd163bd5603cdb5a7230
-  data.tar.gz: 714fc815b6bed5f22d64a2d944b0127de5a70dc645eecd0b4bf47d000ed807fb
+  metadata.gz: 915afa8d4217314324b96bad612d3fe5703c076a88f9cea988e1cde0bb7f3eb1
+  data.tar.gz: 629d8af1c90fb196355404fd5db123bf233bb663d16f4b7e0ddfb78cdb016270
 SHA512:
-  metadata.gz: 70828196554a043d8331f7919d056fde46eeb1a8b4bd84cf18870857c75f1f91487155a9a4ce601d128e3b93bb452eec477a590ef503748507697a4e8f025a45
-  data.tar.gz: 9427a2e2ea9fd2ec713ca8af1ccb17dcf06f44a1bd86eac7452535d45f66dfa348e08694ad477fbc4d4771ee23789c1cca914c21dc84bccc897fa5130d8fa2f3
+  metadata.gz: '05633495e2ec59b19fc022bd0b94d24e96107c4b72bd0f4e0274a3bebb99905d8f329a64e6d04813e4671cd81aab48f0ddd614614204747dde75c087bac19612'
+  data.tar.gz: e3725702804b8b5c2664c2368f86f4535986590159e14715abf79e2a3571f32cf1660a483c6591adb3fb62942f9ca2023a530f0f2422e99c01979af7ddddfad0

data/lib/alinta-testing/overrides.rb

@@ -1,4 +1,5 @@
 require 'cucumber-rest-bdd'
+require 'alinta-testing/overrides/get_url'
 
 class Hash
   def deep_include?(other)
@@ -41,6 +42,7 @@ def get_url(path)
   url
 end
 
+
 module RestClient
 
   # A global setting to verify ssl certs for all requests. This can be overridden on a

data/lib/alinta-testing/overrides/get_url.rb

@@ -0,0 +1,38 @@
+
+def get_url(path)
+    raise %(Please set an 'endpoint' environment variable provided with the url of the api) unless ENV.key?('endpoint')
+
+    get_url_internal(path, ENV['endpoint'], @urlbasepath, ENV['api_version'])
+end
+
+def get_url_internal(path, endpoint, urlbasepath, apiversion)
+    # remove leading and trailing slashes
+    path = path.gsub(/^\/?(.*)\/?$/, '\1')
+
+    if urlbasepath.to_s.empty?
+        splitpath = path.split('/')
+        basepath =  splitpath.first()
+        path = splitpath.drop(1).join('/')
+    else
+        basepath = urlbasepath
+    end
+    
+    # base end point for all calls
+    url = endpoint
+    url = "#{url}/" unless url.end_with?('/')
+  
+    # common sub-path for this feature
+    url = "#{url}#{basepath}" unless basepath.to_s.empty?
+    url = "#{url}/" unless url.end_with?('/')
+  
+    # versioned route for UAT environments
+    version = apiversion
+    url = "#{url}#{version}" unless version.to_s.empty?
+    url = "#{url}/" unless url.end_with?('/')
+  
+    # final path for this request
+    url = "#{url}#{path}" unless path.empty?
+    url = "#{url}/" unless url.end_with?('/')
+
+    url
+  end

data/lib/alinta-testing/steps/azure.rb

@@ -89,18 +89,10 @@ Given("I retrieve the secret {string} from Azure Storage Vault {string} using ac
 end
 
 Given("I am issuing versioned requests") do
-    if ENV['api_version'] != nil && ENV['api_version'] != ""
-        @urlbasepath = ENV['api_version']
-        @urlbasepath = "#{@urlbasepath}/" unless @urlbasepath.end_with?('/')
-    end
 end
 
 Given("I am issuing versioned requests for {resource_name}") do |resource|
     @urlbasepath = resource
     @urlbasepath = "#{@urlbasepath}/" unless @urlbasepath.end_with?('/')
-    if ENV['api_version'] != nil && ENV['api_version'] != ""
-        @urlbasepath = "#{@urlbasepath}#{ENV['api_version']}"
-        @urlbasepath = "#{@urlbasepath}/" unless @urlbasepath.end_with?('/')
-    end
 end
 

data/lib/alinta-testing/version.rb

@@ -1,3 +1,3 @@
 module AlintaTesting
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alinta-testing
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Matt Hosking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-02 00:00:00.000000000 Z
+date: 2019-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber-rest-bdd
@@ -33,6 +33,7 @@ extra_rdoc_files: []
 files:
 - lib/alinta-testing.rb
 - lib/alinta-testing/overrides.rb
+- lib/alinta-testing/overrides/get_url.rb
 - lib/alinta-testing/steps.rb
 - lib/alinta-testing/steps/azure.rb
 - lib/alinta-testing/version.rb