ops_manager_ui_drivers 1.8.1 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23306845395d7e0252cf2c88bf47e0fb2fde21b5
-  data.tar.gz: 4a53122f9ceb6743186e332581fa60f220b49779
+  metadata.gz: 5ab254bcb62f570df15d4a3952b5901f96368846
+  data.tar.gz: b65a15fbf454137e941929139b1d122640371e73
 SHA512:
-  metadata.gz: 26ddf633af58a01f3bace56ae5012cc77bc194e7b75d26af1188b1d0ac3dbccf856fd82544dc51ad634c0198240ea1bc775d9db5b1b5beffe1940c88338ce279
-  data.tar.gz: a328ee271fec9d26a3f2f4ef374c41511968a681188df6f0f99309e0ff4796dbf9249b85a2a16377664974aac67b4c620ec7eefaa554f42ee55a0cf8dc9f3266
+  metadata.gz: d40b4872893ae5a8454d784bec4bac0b181487d80a2c91bde804fbeedb1ec661dc9a2f7f09dc38cc399b690280a77bd8dbb35c0a7ae74b45947aded074503100
+  data.tar.gz: cf2c96427728341f51110b20026616867f7f08168125eae41a5d878cd4b85171f7cbf2050b06a0aa29d4a0232094372143d2cff50d558c2f69fac084480df530

data/lib/ops_manager_ui_drivers/logger.rb

@@ -0,0 +1,15 @@
+module OpsManagerUiDrivers
+  module Logger
+    def self.logger=(logger)
+      @logger = logger
+    end
+
+    def self.logger
+      @logger ||= ::Logger.new(STDOUT)
+    end
+
+    def self.debug(string)
+      logger.debug("#{string} @ #{DateTime.now}")
+    end
+  end
+end

data/lib/ops_manager_ui_drivers/page_helpers.rb

@@ -4,20 +4,36 @@ module OpsManagerUiDrivers
   module PageHelpers
     include OpsManagerUiDrivers::WaitHelper
 
-    def om_1_4(ops_manager_url)
-      @om_1_4 ||= create_web_ui(ops_manager_url, Version14)
+    def om_1_4(ops_manager_url, browser = self)
+      @om_1_4 ||= create_web_ui(
+        ops_manager_url: ops_manager_url,
+        browser: browser,
+        version_module: Version14,
+      )
     end
 
-    def om_1_5(ops_manager_url)
-      @om_1_5 ||= create_web_ui(ops_manager_url, Version15)
+    def om_1_5(ops_manager_url, browser = self)
+      @om_1_5 ||= create_web_ui(
+        ops_manager_url: ops_manager_url,
+        browser: browser,
+        version_module: Version15,
+      )
     end
 
-    def om_1_6(ops_manager_url)
-      @om_1_6 ||= create_web_ui(ops_manager_url, Version16)
+    def om_1_6(ops_manager_url, browser = self)
+      @om_1_6 ||= create_web_ui(
+        ops_manager_url: ops_manager_url,
+        browser: browser,
+        version_module: Version16,
+      )
     end
 
-    def om_rc(ops_manager_url)
-      @om_1_7 ||= create_web_ui(ops_manager_url, Version17)
+    def om_rc(ops_manager_url, browser = self)
+      @om_1_7 ||= create_web_ui(
+        ops_manager_url: ops_manager_url,
+        browser: browser,
+        version_module: Version17,
+      )
     end
 
     def api_1_4(host:, username:, password:)
@@ -38,10 +54,10 @@ module OpsManagerUiDrivers
 
     private
 
-    def create_web_ui(ops_manager_url, version_module)
+    def create_web_ui(ops_manager_url:, browser:, version_module:)
       Capybara.app_host = ops_manager_url
-      puts "Preparing to interact with #{version_module.inspect} at #{Capybara.app_host}"
-      version_module::WebUi.new(browser: self)
+      Logger.debug "Preparing to interact with #{version_module.inspect} at #{Capybara.app_host}"
+      version_module::WebUi.new(browser: browser)
     end
   end
 end

data/lib/ops_manager_ui_drivers/version.rb

@@ -1,3 +1,3 @@
 module OpsManagerUiDrivers
-  VERSION = '1.8.1'
+  VERSION = '1.8.2'
 end

data/lib/ops_manager_ui_drivers/version14/ops_manager_director.rb

@@ -36,7 +36,7 @@ module OpsManagerUiDrivers
               username: test_settings.ops_manager.vcenter.creds.username,
               password: test_settings.ops_manager.vcenter.creds.password,
               datacenter: test_settings.ops_manager.vcenter.datacenter,
-              datastores: test_settings.ops_manager.vcenter.datastore,
+              datastores: test_settings.ops_manager.vcenter.persistent_datastore,
             )
           when OpsManagerUiDrivers::AWS_IAAS_TYPE then
             configure_aws(

data/lib/ops_manager_ui_drivers/wait_helper.rb

@@ -11,14 +11,14 @@ module OpsManagerUiDrivers
       blk.call
     rescue EarlyFailException
       raise
-    rescue RSpec::Expectations::ExpectationNotMetError, StandardError
-      puts "------- retries_left=#{retries_left}"
+    rescue RSpec::Expectations::ExpectationNotMetError, StandardError => e
+      Logger.debug "------- retries_left=#{retries_left}"
       retries_left -= 1
       if retries_left > 0
         sleep(interval)
         retry
       else
-        puts "------- propagate error=#{retries_left}"
+        Logger.debug "------- propagate error=#{e}"
         raise
       end
     end
@@ -36,26 +36,26 @@ module OpsManagerUiDrivers
     private
 
     def wait_debug(title, &blk)
-      puts("--- BEGIN #{title} @ #{DateTime.now}")
+      Logger.debug "--- BEGIN #{title}"
       Benchmark.bm do |x|
         x.report { blk.call }
       end
     ensure
-      puts("--- END   #{title} @ #{DateTime.now}")
+      Logger.debug "--- END   #{title}"
     end
 
     def wait_until(end_time, &blk)
       blk.call
     rescue EarlyFailException
       raise
-    rescue RSpec::Expectations::ExpectationNotMetError, StandardError
+    rescue RSpec::Expectations::ExpectationNotMetError, StandardError => e
       seconds_left = (end_time - Time.now).round
-      puts "------- time_left=#{seconds_left} sec"
+      Logger.debug "------- time_left=#{seconds_left} sec"
       if seconds_left > SLEEP_INTERVAL
         sleep(SLEEP_INTERVAL)
         retry
       else
-        puts "------- propagate error=#{seconds_left}"
+        Logger.debug "------- propagate error=#{e}"
         raise
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ops_manager_ui_drivers
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
 platform: ruby
 authors:
 - Pivotal, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2015-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -168,6 +168,7 @@ files:
 - bin/setup
 - ci/run_specs.sh
 - lib/ops_manager_ui_drivers.rb
+- lib/ops_manager_ui_drivers/logger.rb
 - lib/ops_manager_ui_drivers/page_helpers.rb
 - lib/ops_manager_ui_drivers/version.rb
 - lib/ops_manager_ui_drivers/version14/api.rb