ops_manager_ui_drivers 1.8.3 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b930e3f205b8937732452479b88a4f389c76eebd
-  data.tar.gz: a24c7cde40a6fb481833cf9499a639a321ef04e4
+  metadata.gz: 4f1e809044fafeafe95fc652e761f6fabcad5b2b
+  data.tar.gz: c60b9e9e4a63b0bcff76301eb240a251f018768f
 SHA512:
-  metadata.gz: 14b2f741176cbbcece6384b5fb16086d3c4b74a83fbb00e907c1c5c9e12677ebbf4630eae9c9b0ddf5dc418f2c7d418fc5863b4ba245b8267660ec0843c3b95b
-  data.tar.gz: 37890dcd7cd4c2bbb37cdf6134d1da3645b3b5ebd142081e5e6d8c80476661f9a7ea46fde2c8ba9be358bfca480f3a81cb750b0a01f3b6fe7a86bf0f3546e1e5
+  metadata.gz: f4abb047f50738ce8c47a0bd8b6c24856c56ed10963b302754b01b5f35c11ca198fd79667579a465cc4878a443ef3a997a25a98cf8eaba79e29b50ec614431f2
+  data.tar.gz: 431b28472731026e52258a346406e8b3b6898332c5f688971410ea51c0f3e3c48c610b7b9c7c403f3df1fa2479707218e9e8eb29a6251b6d0086c6be799dd32d

data/lib/ops_manager_ui_drivers/version.rb

@@ -1,3 +1,3 @@
 module OpsManagerUiDrivers
-  VERSION = '1.8.3'
+  VERSION = '1.9.0'
 end

data/lib/ops_manager_ui_drivers/version14/ops_manager_director.rb

@@ -174,7 +174,7 @@ module OpsManagerUiDrivers
           browser.select deployment_network
         end
         browser.click_on 'Save'
-        browser.wait { browser.assert_text('Successfully assigned infrastructure network') }
+        browser.poll_up_to_times(20) { browser.assert_text('Successfully assigned infrastructure network') }
       end
 
       def assign_network(deployment_network:)

data/lib/ops_manager_ui_drivers/version14/product_configuration.rb

@@ -12,7 +12,7 @@ module OpsManagerUiDrivers
         visit_product_page
         browser.click_on "show-#{product_name}-stemcell-assignment-action"
         browser.attach_file('product_stemcell[file]', stemcell_file_path, {visible: false})
-        browser.wait {
+        browser.poll_up_to_times(20) {
           browser.assert_text("Stemcell '#{File.basename(stemcell_file_path)}' has been uploaded successfully.")
         }
       end

data/lib/ops_manager_ui_drivers/version14/state_change_progress.rb

@@ -35,6 +35,8 @@ module OpsManagerUiDrivers
         browser.current_path =~ %r(^/+install)
       end
 
+      private
+
       attr_reader :browser
     end
   end

data/lib/ops_manager_ui_drivers/version15/ops_manager_director.rb

@@ -146,7 +146,7 @@ module OpsManagerUiDrivers
           browser.select deployment_network
         end
         browser.click_on 'Save'
-        browser.wait { browser.assert_text('Successfully assigned infrastructure network') }
+        browser.poll_up_to_times(20) { browser.assert_text('Successfully assigned infrastructure network') }
       end
 
       def assign_network(deployment_network:)
@@ -164,7 +164,7 @@ module OpsManagerUiDrivers
           browser.choose('Use default BOSH password')
         end
         browser.click_on 'Save'
-        browser.wait { browser.assert_text('Settings updated') }
+        browser.poll_up_to_times(20) { browser.assert_text('Settings updated') }
       end
 
       private

data/lib/ops_manager_ui_drivers/version15/product_configuration.rb

@@ -12,7 +12,7 @@ module OpsManagerUiDrivers
         visit_product_page
         browser.click_on "show-#{product_name}-stemcell-assignment-action"
         browser.attach_file('product_stemcell[file]', stemcell_file_path, {visible: false})
-        browser.wait {
+        browser.poll_up_to_times(20) {
           browser.assert_text("Stemcell '#{File.basename(stemcell_file_path)}' has been uploaded successfully.")
         }
       end

data/lib/ops_manager_ui_drivers/version15/product_dashboard.rb

@@ -25,7 +25,7 @@ module OpsManagerUiDrivers
         browser.click_on 'close-warning'
         browser.attach_file 'import[file]', file_path
         browser.click_on 'import-settings'
-        browser.wait { browser.assert_text('Successfully imported installation.') }
+        browser.poll_up_to_times(20) { browser.assert_text('Successfully imported installation.') }
       end
 
       def upgrade_microbosh

data/lib/ops_manager_ui_drivers/version15/state_change_progress.rb

@@ -35,6 +35,8 @@ module OpsManagerUiDrivers
         browser.current_path =~ %r(^/+install)
       end
 
+      private
+
       attr_reader :browser
     end
   end

data/lib/ops_manager_ui_drivers/version16/ops_manager_director.rb

@@ -146,7 +146,7 @@ module OpsManagerUiDrivers
           browser.select deployment_network
         end
         browser.click_on 'Save'
-        browser.wait { browser.assert_text('Successfully assigned infrastructure network') }
+        browser.poll_up_to_times(20) { browser.assert_text('Successfully assigned infrastructure network') }
       end
 
       def assign_network(deployment_network:)
@@ -164,7 +164,7 @@ module OpsManagerUiDrivers
           browser.choose('Use default BOSH password')
         end
         browser.click_on 'Save'
-        browser.wait { browser.assert_text('Settings updated') }
+        browser.poll_up_to_times(20) { browser.assert_text('Settings updated') }
       end
 
       private

data/lib/ops_manager_ui_drivers/version16/product_configuration.rb

@@ -12,7 +12,7 @@ module OpsManagerUiDrivers
         visit_product_page
         browser.click_on "show-#{product_name}-stemcell-assignment-action"
         browser.attach_file('product_stemcell[file]', stemcell_file_path, {visible: false})
-        browser.wait {
+        browser.poll_up_to_times(20) {
           browser.assert_text("Stemcell '#{File.basename(stemcell_file_path)}' has been uploaded successfully.")
         }
       end

data/lib/ops_manager_ui_drivers/version16/product_dashboard.rb

@@ -25,7 +25,7 @@ module OpsManagerUiDrivers
         browser.click_on 'close-warning'
         browser.attach_file 'import[file]', file_path
         browser.click_on 'import-settings'
-        browser.wait { browser.assert_text('Successfully imported installation.') }
+        browser.poll_up_to_times(20) { browser.assert_text('Successfully imported installation.') }
       end
 
       def delete_product(product_name)

data/lib/ops_manager_ui_drivers/version16/product_form.rb

@@ -16,7 +16,7 @@ module OpsManagerUiDrivers
       end
 
       def generate_self_signed_cert(wildcard_domain)
-        browser.click_on 'Generate RSA Certificate'
+        browser.click_on 'Generate Self-Signed RSA Certificate'
         browser.within '#rsa-certificate-form' do
           browser.fill_in 'rsa_certificate[domains]', with: wildcard_domain
           browser.click_on 'save-rsa-certificate-action'

data/lib/ops_manager_ui_drivers/version16/state_change_progress.rb

@@ -35,6 +35,8 @@ module OpsManagerUiDrivers
         browser.current_path =~ %r(^/+install)
       end
 
+      private
+
       attr_reader :browser
     end
   end

data/lib/ops_manager_ui_drivers/version17/ops_manager_director.rb

@@ -146,7 +146,7 @@ module OpsManagerUiDrivers
           browser.select deployment_network
         end
         browser.click_on 'Save'
-        browser.wait { browser.assert_text('Successfully assigned infrastructure network') }
+        browser.poll_up_to_times(20) { browser.assert_text('Successfully assigned infrastructure network') }
       end
 
       def assign_network(deployment_network:)
@@ -164,7 +164,7 @@ module OpsManagerUiDrivers
           browser.choose('Use default BOSH password')
         end
         browser.click_on 'Save'
-        browser.wait { browser.assert_text('Settings updated') }
+        browser.poll_up_to_times(20) { browser.assert_text('Settings updated') }
       end
 
       private

data/lib/ops_manager_ui_drivers/version17/product_configuration.rb

@@ -12,7 +12,7 @@ module OpsManagerUiDrivers
         visit_product_page
         browser.click_on "show-#{product_name}-stemcell-assignment-action"
         browser.attach_file('product_stemcell[file]', stemcell_file_path, {visible: false})
-        browser.wait {
+        browser.poll_up_to_times(20) {
           browser.assert_text("Stemcell '#{File.basename(stemcell_file_path)}' has been uploaded successfully.")
         }
       end

data/lib/ops_manager_ui_drivers/version17/product_dashboard.rb

@@ -25,7 +25,7 @@ module OpsManagerUiDrivers
         browser.click_on 'close-warning'
         browser.attach_file 'import[file]', file_path
         browser.click_on 'import-settings'
-        browser.wait { browser.assert_text('Successfully imported installation.') }
+        browser.poll_up_to_times(20) { browser.assert_text('Successfully imported installation.') }
       end
 
       def delete_product(product_name)

data/lib/ops_manager_ui_drivers/version17/state_change_progress.rb

@@ -35,6 +35,8 @@ module OpsManagerUiDrivers
         browser.current_path =~ %r(^/+install)
       end
 
+      private
+
       attr_reader :browser
     end
   end

data/lib/ops_manager_ui_drivers/wait_helper.rb

@@ -1,56 +1,58 @@
 require 'time'
-require 'benchmark'
 
 module OpsManagerUiDrivers
   module WaitHelper
-    SLEEP_INTERVAL = 1
+    SLEEP_INTERVAL = 0.5
 
     EarlyFailException = Class.new(Exception)
 
-    def wait(retries_left=20, interval=0.5, &blk)
-      blk.call
-    rescue EarlyFailException
-      raise
-    rescue RSpec::Expectations::ExpectationNotMetError, StandardError => e
-      Logger.debug "------- retries_left=#{retries_left}"
-      retries_left -= 1
-      if retries_left > 0
-        sleep(interval)
-        retry
-      else
-        Logger.debug "------- propagate error=#{e}"
-        raise
-      end
-    end
-
     def fail_early(msg)
       fail(EarlyFailException.new(msg))
     end
 
     def poll_up_to_mins(minutes, &blk)
-      wait_debug("Polling for up to #{minutes} mins") do
-        wait_until(minutes_to_time(minutes), &blk)
-      end
+      title = "Polling for #{minutes} mins"
+
+      Logger.debug "--- BEGIN #{title}"
+      retry_until(minutes_to_time(minutes), &blk)
+    ensure
+      Logger.debug "--- END   #{title}"
     end
 
-    private
+    def poll_up_to_times(times, &blk)
+      title = "Polling for #{times} times"
 
-    def wait_debug(title, &blk)
       Logger.debug "--- BEGIN #{title}"
-      Benchmark.bm do |x|
-        x.report { blk.call }
-      end
+      retry_times(times, &blk)
     ensure
       Logger.debug "--- END   #{title}"
     end
 
-    def wait_until(end_time, &blk)
+    private
+
+    def retry_times(retries, &blk)
+      blk.call
+    rescue EarlyFailException
+      raise
+    rescue RSpec::Expectations::ExpectationNotMetError, StandardError => e
+      retries -= 1
+      Logger.debug "------- retries_left=#{retries}"
+      if retries > 0
+        sleep(SLEEP_INTERVAL)
+        retry
+      else
+        Logger.debug "------- propagate error=#{e}"
+        raise
+      end
+    end
+
+    def retry_until(end_time, &blk)
       blk.call
     rescue EarlyFailException
       raise
     rescue RSpec::Expectations::ExpectationNotMetError, StandardError => e
       seconds_left = (end_time - Time.now).round
-      Logger.debug "------- time_left=#{seconds_left} sec"
+      Logger.debug "------- seconds_left=#{seconds_left}"
       if seconds_left > SLEEP_INTERVAL
         sleep(SLEEP_INTERVAL)
         retry

data/ops_manager_ui_drivers.gemspec

@@ -22,10 +22,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'capybara-webkit'
   spec.add_dependency 'selenium-webdriver'
 
-  spec.add_development_dependency 'bundler', '~> 1.9'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'codeclimate-test-reporter'
   spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'recursive-open-struct'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ops_manager_ui_drivers
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.9.0
 platform: ruby
 authors:
 - Pivotal, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-24 00:00:00.000000000 Z
+date: 2015-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -56,16 +56,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -98,16 +98,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -159,7 +159,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE
@@ -282,7 +281,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Capybara helpers for configuring Pivotal Ops Manager

data/.rubocop.yml

@@ -1,2 +0,0 @@
-AllCops:
-  TargetRubyVersion: 2.2