alinta-testing 0.1 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f38820133cc2414f19de639be773bfc30d528aa4
-  data.tar.gz: 64da3b0c110a3777eecb97ee034df61fad0e8f0f
+  metadata.gz: 442a86cac3236d04a07d97d37ddb0af22af6bda0
+  data.tar.gz: 8531908e53c7228584340b95e853600833178c8a
 SHA512:
-  metadata.gz: ff9ef85208b5f8f4c05c2757846bbec8c8c8a93e4611b1e9da50a803ce17fa4a51a6458872919cefe9d26d17cb5ee83737d4411d441d9680a0e498c0882bc87d
-  data.tar.gz: 8365a90f1ab433999b2f37b4d4a23017287355c41954c31db77767d5109dbbff0989d4669ba6be68fec8ace97f154d4685e51dca68683b4825bb7814fea07d7a
+  metadata.gz: ca073af19b065de6ce3b47ab5e4fd16093b32ffa33653e3134a5a30a9f2e853d1d2029481285c2c0e1bd403d10825581766c3c633af6742dbb65fcafff220862
+  data.tar.gz: b7861684e0a396625a6c6e2b0bdbe6ffd135c3b27bed6a8d46a8c6d3f9fc7780098244073104d1985d527cce5b5bb20cd7cff54fa601730abea53b9e48bd9b30

data/lib/alinta-testing/steps.rb

@@ -1,16 +1,20 @@
 require 'cucumber-rest-bdd'
 
 Given(/^I am an API management authenticated client$/) do
-  tenant_id = ENV['ALINTA_TENANTID']
-  client_id = ENV['ALINTA_CLIENTID']
-  client_secret = ENV['ALINTA_CLIENTSECRET']
-  vault_name = ENV['ALINTA_VAULT']
-  if tenant_id.nil? or client_id.nil? or client_secret.nil? or vault_name.nil?
-      fail('One or more required environment variables have not been defined.')
+  if ENV['apim_subscription_key'] != nil
+    @apim_subscription_key = ENV['apim_subscription_key']
+  else
+    variables = %w{ALINTA_TENANTID ALINTA_CLIENTID ALINTA_CLIENTSECRET ALINTA_VAULT}
+    missing = variables.find_all { |v| ENV[v] == nil }
+    unless missing.empty?
+      raise "The following required environment variables have not been defined: #{missing.join(', ')}."
+    end
+    steps %Q{
+      Given I retrieve the API Management subscription key secret "APIMgmnt--End2End--Starter--Primary" from Azure Storage Vault "#{ENV['ALINTA_VAULT']}" using tenant "#{ENV['ALINTA_TENANTID']}" with credentials "#{ENV['ALINTA_CLIENTID']}" and "#{ENV['ALINTA_CLIENTSECRET']}"
+    }
   end
   steps %Q{
-      Given I retrieve the API Management subscription key secret "APIMgmnt--End2End--Starter--Primary" from Azure Storage Vault "#{vault_name}" using tenant "#{tenant_id}" with credentials "#{client_id}" and "#{client_secret}"
-      And I am a client
-      And I add the API Management key header
+    Given I am a client
+    And I add the API Management key header
   }
 end

data/lib/alinta-testing/version.rb

@@ -1,3 +1,3 @@
 module AlintaTesting
-  VERSION = "0.1"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alinta-testing
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.1.1
 platform: ruby
 authors:
 - Matt Hosking