testcentricity_web 0.7.7 → 0.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd9cf8a1aa80abfcac896b14099e1a5dfd50fc9a
-  data.tar.gz: 40ef5a530ffe4bdfa7b685dba070ff148c03c668
+  metadata.gz: 98298b1269fe2d4737edcca42ee62cd492821cb1
+  data.tar.gz: d67323c361b7131e2989a7f3cd7ea6672edc1ca5
 SHA512:
-  metadata.gz: 99b815226510736a9d1c347df0e8a14168fd3e30d778b1497b71ec98dceecad396ddfde9b67b88c32aee1c23b269a65a6038aa70f8eff319380ba1c639bf4688
-  data.tar.gz: 113e01a7682fa043fa59428c1be6a6629b5922e92d899e81f4b35b0b24b54b0b8b952a2672ebc6236f2df27fc162548cd119decf1bc2ab5fe4511a7e7f6cdd02
+  metadata.gz: 5156b3d332280bd77036acb1a671a4ef981d5eaaea60371b8e091d3a5bd0b5df524082141e1e6873b165d983e45ee97a15b6ff4af8a48c4a3baeddea5568631c
+  data.tar.gz: de20a06d2d0f82da95a66ef10bcb4a808a8f40daaa5a1daeb387d9d49d1926d66d89485f2444cf9d0bbd1dcdf84a0a9ec829b213898efc8e755e796d08d4d0a8

data/lib/testcentricity_web/data_objects_helper.rb

@@ -1,3 +1,5 @@
+require 'yaml'
+
 module TestCentricity
 
   XL_PRIMARY_DATA_PATH  ||= 'features/test_data/'
@@ -23,9 +25,17 @@ module TestCentricity
   end
 
 
-  class ExcelDataSource
+  class DataSource
     attr_accessor :current
 
+    def read_yaml_node_data(file_name, node_name)
+      data = YAML.load_file("#{XL_PRIMARY_DATA_PATH}#{file_name}")
+      data[node_name]
+    end
+  end
+
+
+  class ExcelDataSource < TestCentricity::DataSource
     def pick_excel_data_source(sheet, row_name)
       environment = ENV['TEST_ENVIRONMENT']
       data_file = "#{XL_PRIMARY_DATA_PATH}#{environment}_data.xls"

data/lib/testcentricity_web/environment.rb

@@ -4,8 +4,14 @@ module TestCentricity
 
     WKS_ENVIRONS ||= 'Environments'
 
-    def find_environ(row_name)
-      @current = Environ.new(ExcelData.read_row_data(XL_PRIMARY_DATA_FILE, WKS_ENVIRONS, row_name))
+    def find_environ(environ_name, source_type = :excel)
+      case source_type
+      when :excel
+        data = ExcelData.read_row_data(XL_PRIMARY_DATA_FILE, WKS_ENVIRONS, environ_name)
+      when :yaml
+        data = read_yaml_node_data('environments.yml', environ_name)
+      end
+      @current = Environ.new(data)
       Environ.set_current(@current)
     end
   end

data/lib/testcentricity_web/page_objects_helper.rb

@@ -162,13 +162,13 @@ module TestCentricity
 
     def open_portal
       environment = Environ.current
-      (environment.hostname.length > 0) ?
-          url = "#{environment.hostname}/#{environment.base_url}#{environment.append}" :
-          url = "#{environment.base_url}#{environment.append}"
-      if environment.user_id.length > 0 && environment.password.length > 0
-        visit "#{environment.protocol}://#{environment.user_id}:#{environment.password}@#{url}"
-      else
+      environment.hostname.blank? ?
+          url = "#{environment.base_url}#{environment.append}" :
+          url = "#{environment.hostname}/#{environment.base_url}#{environment.append}"
+      if environment.user_id.blank? || environment.password.blank?
         visit "#{environment.protocol}://#{url}"
+      else
+        visit "#{environment.protocol}://#{environment.user_id}:#{environment.password}@#{url}"
       end
       Environ.set_portal_state(:open)
     end

data/lib/testcentricity_web/version.rb

@@ -1,3 +1,3 @@
 module TestCentricityWeb
-  VERSION = '0.7.7'
+  VERSION = '0.7.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: testcentricity_web
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.7.8
 platform: ruby
 authors:
 - A.J. Mrozinski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2016-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler