alinta-testing 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 736830c9210449472ed8b5ec12b0d43a94590cb456f552daa8c63f66d63e7a0e
-  data.tar.gz: c1dddaacbb07604921305915b20fb40f4c9ba2c4a496688ea7e745779cf1e9ba
+  metadata.gz: d40c0c14d7f19784a46fe5cb43e8171680d03c70053f655575916656c0a99b6b
+  data.tar.gz: cde48ca46dfa89419b1490546bc45b5e1864b5da4d479f239a6e95f76d83c23c
 SHA512:
-  metadata.gz: 34aed9123ff9f1134b62d68fc60aa54f0bf04ae38ee377c9212c9a7e64cbadc8eb2242936d3aaf5e92d858dbe5acdbf4535ac4d23dd4dcefb26608c6f2a48121
-  data.tar.gz: fe364f74e54bf1eb57216ec5c806a7f710260b0982d0bd5d32ca4614aeb6f3164b12233bff8c2618c6ceae5bac16a94ea804b1335dbc93f10888ae4a78b333c4
+  metadata.gz: 12922eb76b533bfae54a8bdb9d8aebc3ecb1cb300b5f8e985f6a5295ac2560d7f4699e8983032d8832d319c502c3fbfe23a14c7a5a117d4881c3579ae78f16c4
+  data.tar.gz: a8e14a9c01ab7b1c9bc0a22badbc14469f73567b9e1348e1453a24e7d4d66465a4fb35481b0a83fb81087fd481e3a072e2860723f8060721f5df521b9968f5cd

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

@@ -7,31 +7,28 @@ end
 
 def get_url_internal(path, endpoint, urlbasepath, apiversion)
     # remove leading and trailing slashes
-    path = path.gsub(/^\/?(.*)\/?$/, '\1')
+    endpoint = endpoint.gsub(/^(.*?)\/?$/, '\1')
+    path = path.gsub(/^\/?(.*?)\/?$/, '\1') unless path.to_s.empty?
+    urlbasepath = urlbasepath.gsub(/^\/?(.*?)\/?$/, '\1') unless urlbasepath.to_s.empty?
+    apiversion = apiversion.gsub(/^\/?(.*?)\/?$/, '\1') unless apiversion.to_s.empty?
 
-    if urlbasepath.to_s.empty?
-        splitpath = path.split('/')
-        basepath =  splitpath.first()
-        path = splitpath.drop(1).join('/')
-    else
-        basepath = urlbasepath
-    end
+    path = "#{urlbasepath}/#{path}" unless urlbasepath.to_s.empty?
+
+    splitpath = path.split('/')
+    basepath =  splitpath.first()
+    path = splitpath.drop(1).join('/')
     
     # 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?('/')
+    url = "#{url}/#{basepath}" unless basepath.to_s.empty?
   
     # versioned route for UAT environments
-    version = apiversion
-    url = "#{url}#{version}" unless version.to_s.empty?
-    url = "#{url}/" unless url.end_with?('/')
+    url = "#{url}/#{apiversion}" unless apiversion.to_s.empty?
   
     # final path for this request
-    url = "#{url}#{path}" unless path.empty?
+    url = "#{url}/#{path}" unless path.to_s.empty?
 
     url
   end

data/lib/alinta-testing/version.rb

@@ -1,3 +1,3 @@
 module AlintaTesting
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alinta-testing
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Matt Hosking
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-21 00:00:00.000000000 Z
+date: 2019-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber-rest-bdd