ops_manager_ui_drivers 2.0.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7286d612b2128a4a6b9366524759bac3548e38c
-  data.tar.gz: c48113714c723739253939906847a06900159360
+  metadata.gz: 209b6508cf051baff7f2a3fa34fbfeb60b0907bd
+  data.tar.gz: 1015bf9ad7181603c5b4f87a7c7bdeec8f0a91be
 SHA512:
-  metadata.gz: ef1f9389c7e24a0d48024e3c4b64687974017701da651cc2c6fe547ae49b728661969ff5f48ee208f16ac1012dd5af5bbe08cce6b06b5f4bb02b7ef3fe60c045
-  data.tar.gz: 3b5c711c002780cab1738977b107291c636c02c607df8a8f8228eccb21ddda93f684ad432a8b8d3e004fc9bea5c438a7d6bd471cf49e2fbce4f3fbef904c3e12
+  metadata.gz: c882661d818e490db4e04cb6337ffb4d030d958f0b486b17e964146a3bcdc41519a546f92a215953ae651f6f4d826600cb23fded777aa9d89422ec7b0e44ddc0
+  data.tar.gz: fb8b9c48ef46dfabab4300218ee0b19928b56137a2ec2dac90c9a839eb0c23e5039ab597e6e9ddd89cb7b1b45041c27f7eee972b1b669f610e6dd36125cb899c

data/.travis.yml

@@ -1 +1,4 @@
 language: ruby
+rvm:
+ - 2.3.0
+ - 2.1.0

data/lib/backport_refinements.rb

@@ -0,0 +1,34 @@
+module OpsManagerUiDrivers
+  module BackportRefinements
+    def self.should_refine?
+      Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.3.0")
+    end
+
+    def self.ported_dig(obj, indices)
+      head = indices.first
+      new_obj = obj[head]
+      if indices.count == 1
+        new_obj
+      else
+        tail = indices[1..-1]
+        ported_dig(new_obj, tail)
+      end
+    end
+
+    refine Array do
+      next unless BackportRefinements.should_refine?
+
+      def dig(*indices)
+        BackportRefinements.ported_dig(self, indices)
+      end
+    end
+
+    refine Hash do
+      next unless BackportRefinements.should_refine?
+
+      def dig(*indices)
+        BackportRefinements.ported_dig(self, indices)
+      end
+    end
+  end
+end

data/lib/ops_manager_ui_drivers.rb

@@ -1,5 +1,7 @@
 require 'active_support'
 require 'active_support/core_ext'
+require 'backport_refinements'
+
 Dir[File.join(__dir__, '**', '*.rb')].each do |ops_manager_ui_drivers|
   require ops_manager_ui_drivers
 end

data/lib/ops_manager_ui_drivers/version.rb

@@ -1,3 +1,3 @@
 module OpsManagerUiDrivers
-  VERSION = '2.0.0'
+  VERSION = '2.0.2'
 end

data/lib/ops_manager_ui_drivers/version14/ops_manager_director.rb

@@ -1,3 +1,4 @@
+using OpsManagerUiDrivers::BackportRefinements
 module OpsManagerUiDrivers
   module Version14
     class OpsManagerDirector
@@ -73,9 +74,9 @@ module OpsManagerUiDrivers
       end
 
       def add_networks(test_settings)
-        iaas_networks = test_settings.ops_manager.networks
+        iaas_networks = test_settings.dig('ops_manager', 'networks')
 
-        case test_settings.iaas_type
+        case test_settings.dig('iaas_type')
           when OpsManagerUiDrivers::AWS_IAAS_TYPE, OpsManagerUiDrivers::OPENSTACK_IAAS_TYPE then
             first_network = iaas_networks.first
             browser.click_on 'show-network-action'
@@ -148,11 +149,10 @@ module OpsManagerUiDrivers
       end
 
       def assign_networks(ops_manager)
-        if ops_manager.vcenter
+        if ops_manager.dig('vcenter')
           deployment_network = ops_manager.dig('networks', 0)
-
           infrastructure_network =
-            ops_manager.networks[1] ? ops_manager.dig('networks', 1) : ops_manager.dig('networks', 0)
+            ops_manager.dig('networks', 1) ? ops_manager.dig('networks', 1) : ops_manager.dig('networks', 0)
 
           assign_networks_vsphere(
             deployment_network:     deployment_network['name'],

data/lib/ops_manager_ui_drivers/version15/ops_manager_director.rb

@@ -1,3 +1,4 @@
+using OpsManagerUiDrivers::BackportRefinements
 module OpsManagerUiDrivers
   module Version15
     class OpsManagerDirector
@@ -71,26 +72,26 @@ module OpsManagerUiDrivers
 
       def config_director(ops_manager)
         browser.click_on 'Director Config'
-        browser.fill_in('director_configuration[ntp_servers_string]', with: ops_manager.ntp_servers)
-        browser.check('Enable VM Resurrector Plugin') if ops_manager.resurrector_enabled
+        browser.fill_in('director_configuration[ntp_servers_string]', with: ops_manager.dig('ntp_servers'))
+        browser.check('Enable VM Resurrector Plugin') if ops_manager.dig('resurrector_enabled')
 
-        s3_blobstore = ops_manager.s3_blobstore
+        s3_blobstore = ops_manager.dig('s3_blobstore')
         if s3_blobstore
           browser.choose('S3 Compatible Blobstore')
-          browser.fill_in('director_configuration[s3_blobstore_options][endpoint]', with: s3_blobstore.endpoint)
-          browser.fill_in('director_configuration[s3_blobstore_options][bucket_name]', with: s3_blobstore.bucket_name)
-          browser.fill_in('director_configuration[s3_blobstore_options][access_key]', with: s3_blobstore.access_key_id)
-          browser.fill_in('director_configuration[s3_blobstore_options][secret_key]', with: s3_blobstore.secret_access_key)
+          browser.fill_in('director_configuration[s3_blobstore_options][endpoint]', with: s3_blobstore.dig('endpoint'))
+          browser.fill_in('director_configuration[s3_blobstore_options][bucket_name]', with: s3_blobstore.dig('bucket_name'))
+          browser.fill_in('director_configuration[s3_blobstore_options][access_key]', with: s3_blobstore.dig('access_key_id'))
+          browser.fill_in('director_configuration[s3_blobstore_options][secret_key]', with: s3_blobstore.dig('secret_access_key'))
         end
 
-        mysql = ops_manager.mysql
+        mysql = ops_manager.dig('mysql')
         if mysql
           browser.choose('External MySQL Database')
-          browser.fill_in('director_configuration[external_database_options][host]', with: mysql.host)
-          browser.fill_in('director_configuration[external_database_options][port]', with: mysql.port)
-          browser.fill_in('director_configuration[external_database_options][user]', with: mysql.user)
-          browser.fill_in('director_configuration[external_database_options][password]', with: mysql.password)
-          browser.fill_in('director_configuration[external_database_options][database]', with: mysql.dbname)
+          browser.fill_in('director_configuration[external_database_options][host]', with: mysql.dig('host'))
+          browser.fill_in('director_configuration[external_database_options][port]', with: mysql.dig('port'))
+          browser.fill_in('director_configuration[external_database_options][user]', with: mysql.dig('user'))
+          browser.fill_in('director_configuration[external_database_options][password]', with: mysql.dig('password'))
+          browser.fill_in('director_configuration[external_database_options][database]', with: mysql.dig('dbname'))
         end
 
         browser.click_on 'Save'
@@ -111,18 +112,18 @@ module OpsManagerUiDrivers
       end
 
       def assign_networks(ops_manager)
-        if ops_manager.vcenter
-          deployment_network = ops_manager.networks[0]
+        if ops_manager.dig('vcenter')
+          deployment_network = ops_manager.dig('networks', 0)
 
           infrastructure_network =
-            ops_manager.networks[1] ? ops_manager.networks[1] : ops_manager.networks[0]
+            ops_manager.dig('networks', 1) ? ops_manager.dig('networks', 1) : ops_manager.dig('networks', 0)
 
           assign_networks_vsphere(
             infrastructure_network: infrastructure_network['name'],
             deployment_network:     deployment_network['name'],
           )
         else
-          assign_network(deployment_network: ops_manager.networks[0]['name'])
+          assign_network(deployment_network: ops_manager.dig('networks', 0, 'name'))
         end
       end
 

data/lib/ops_manager_ui_drivers/version15/product_dashboard.rb

@@ -7,8 +7,10 @@ module OpsManagerUiDrivers
         open_dashboard
         browser.click_on 'toggle-installation-dropdown-action'
         browser.click_on 'show-settings'
-        browser.click_on 'close-warning'
-        browser.expect(browser.page).to_not browser.have_selector('#close-warning', visible: true)
+        browser.page.document.synchronize do
+          browser.click_on 'close-warning'
+          browser.find('#warning-modal[aria-hidden=true]')
+        end
         browser.attach_file 'import[file]', file_path
         browser.click_on 'import-settings'
         browser.poll_up_to_times(20) { browser.assert_text('Successfully imported installation.') }

data/lib/ops_manager_ui_drivers/version15/settings.rb

@@ -1,3 +1,4 @@
+using OpsManagerUiDrivers::BackportRefinements
 module OpsManagerUiDrivers
   module Version15
     module Settings

data/lib/ops_manager_ui_drivers/version16/ops_manager_director.rb

@@ -1,3 +1,4 @@
+using OpsManagerUiDrivers::BackportRefinements
 module OpsManagerUiDrivers
   module Version16
     class OpsManagerDirector
@@ -43,9 +44,9 @@ module OpsManagerUiDrivers
       end
 
       def add_networks(test_settings)
-        iaas_networks = test_settings.ops_manager.networks
+        iaas_networks = test_settings.dig('ops_manager', 'networks')
 
-        case test_settings.iaas_type
+        case test_settings.dig('iaas_type')
           when OpsManagerUiDrivers::AWS_IAAS_TYPE, OpsManagerUiDrivers::OPENSTACK_IAAS_TYPE
             first_network = iaas_networks.first
 
@@ -73,26 +74,26 @@ module OpsManagerUiDrivers
 
       def config_director(ops_manager)
         browser.click_on 'Director Config'
-        browser.fill_in('director_configuration[ntp_servers_string]', with: ops_manager.ntp_servers)
-        browser.check('Enable VM Resurrector Plugin') if ops_manager.resurrector_enabled
+        browser.fill_in('director_configuration[ntp_servers_string]', with: ops_manager.dig('ntp_servers'))
+        browser.check('Enable VM Resurrector Plugin') if ops_manager.dig('resurrector_enabled')
 
-        s3_blobstore = ops_manager.s3_blobstore
+        s3_blobstore = ops_manager.dig('s3_blobstore')
         if s3_blobstore
           browser.choose('S3 Compatible Blobstore')
-          browser.fill_in('director_configuration[s3_blobstore_options][endpoint]', with: s3_blobstore.endpoint)
-          browser.fill_in('director_configuration[s3_blobstore_options][bucket_name]', with: s3_blobstore.bucket_name)
-          browser.fill_in('director_configuration[s3_blobstore_options][access_key]', with: s3_blobstore.access_key_id)
-          browser.fill_in('director_configuration[s3_blobstore_options][secret_key]', with: s3_blobstore.secret_access_key)
+          browser.fill_in('director_configuration[s3_blobstore_options][endpoint]', with: s3_blobstore.dig('endpoint'))
+          browser.fill_in('director_configuration[s3_blobstore_options][bucket_name]', with: s3_blobstore.dig('bucket_name'))
+          browser.fill_in('director_configuration[s3_blobstore_options][access_key]', with: s3_blobstore.dig('access_key_id'))
+          browser.fill_in('director_configuration[s3_blobstore_options][secret_key]', with: s3_blobstore.dig('secret_access_key'))
         end
 
-        mysql = ops_manager.mysql
+        mysql = ops_manager.dig('mysql')
         if mysql
           browser.choose('External MySQL Database')
-          browser.fill_in('director_configuration[external_database_options][host]', with: mysql.host)
-          browser.fill_in('director_configuration[external_database_options][port]', with: mysql.port)
-          browser.fill_in('director_configuration[external_database_options][user]', with: mysql.user)
-          browser.fill_in('director_configuration[external_database_options][password]', with: mysql.password)
-          browser.fill_in('director_configuration[external_database_options][database]', with: mysql.dbname)
+          browser.fill_in('director_configuration[external_database_options][host]', with: mysql.dig('host'))
+          browser.fill_in('director_configuration[external_database_options][port]', with: mysql.dig('port'))
+          browser.fill_in('director_configuration[external_database_options][user]', with: mysql.dig('user'))
+          browser.fill_in('director_configuration[external_database_options][password]', with: mysql.dig('password'))
+          browser.fill_in('director_configuration[external_database_options][database]', with: mysql.dig('dbname'))
         end
 
         browser.click_on 'Save'
@@ -113,15 +114,15 @@ module OpsManagerUiDrivers
       end
 
       def assign_networks(ops_manager)
-        if ops_manager.vcenter
-          network = ops_manager.networks[0]
+        if ops_manager.dig('vcenter')
+          network = ops_manager.dig('networks', 0)
 
           assign_networks_vsphere(
-            infrastructure_network: network['name'],
-            deployment_network:     network['name'],
+            infrastructure_network: network.dig('name'),
+            deployment_network:     network.dig('name'),
           )
         else
-          assign_network(deployment_network: ops_manager.networks[0]['name'])
+          assign_network(deployment_network: ops_manager.dig('networks', 0, 'name'))
         end
       end
 

data/lib/ops_manager_ui_drivers/version16/settings.rb

@@ -1,3 +1,4 @@
+using OpsManagerUiDrivers::BackportRefinements
 module OpsManagerUiDrivers
   module Version16
     module Settings

data/lib/ops_manager_ui_drivers/version17/ops_manager_director.rb

@@ -1,3 +1,5 @@
+using OpsManagerUiDrivers::BackportRefinements
+
 module OpsManagerUiDrivers
   module Version17
     class OpsManagerDirector
@@ -67,20 +69,20 @@ module OpsManagerUiDrivers
         s3_blobstore = ops_manager.dig('s3_blobstore')
         if s3_blobstore
           browser.choose('S3 Compatible Blobstore')
-          browser.fill_in('director_configuration[s3_blobstore_options][endpoint]', with: s3_blobstore.endpoint)
-          browser.fill_in('director_configuration[s3_blobstore_options][bucket_name]', with: s3_blobstore.bucket_name)
-          browser.fill_in('director_configuration[s3_blobstore_options][access_key]', with: s3_blobstore.access_key_id)
-          browser.fill_in('director_configuration[s3_blobstore_options][secret_key]', with: s3_blobstore.secret_access_key)
+          browser.fill_in('director_configuration[s3_blobstore_options][endpoint]', with: s3_blobstore.dig('endpoint'))
+          browser.fill_in('director_configuration[s3_blobstore_options][bucket_name]', with: s3_blobstore.dig('bucket_name'))
+          browser.fill_in('director_configuration[s3_blobstore_options][access_key]', with: s3_blobstore.dig('access_key_id'))
+          browser.fill_in('director_configuration[s3_blobstore_options][secret_key]', with: s3_blobstore.dig('secret_access_key'))
         end
 
         mysql = ops_manager.dig('mysql')
         if mysql
           browser.choose('External MySQL Database')
-          browser.fill_in('director_configuration[external_database_options][host]', with: mysql.host)
-          browser.fill_in('director_configuration[external_database_options][port]', with: mysql.port)
-          browser.fill_in('director_configuration[external_database_options][user]', with: mysql.user)
-          browser.fill_in('director_configuration[external_database_options][password]', with: mysql.password)
-          browser.fill_in('director_configuration[external_database_options][database]', with: mysql.dbname)
+          browser.fill_in('director_configuration[external_database_options][host]', with: mysql.dig('host'))
+          browser.fill_in('director_configuration[external_database_options][port]', with: mysql.dig('port'))
+          browser.fill_in('director_configuration[external_database_options][user]', with: mysql.dig('user'))
+          browser.fill_in('director_configuration[external_database_options][password]', with: mysql.dig('password'))
+          browser.fill_in('director_configuration[external_database_options][database]', with: mysql.dig('dbname'))
         end
 
         browser.click_on 'Save'

data/lib/ops_manager_ui_drivers/version17/settings.rb

@@ -1,3 +1,5 @@
+using OpsManagerUiDrivers::BackportRefinements
+
 module OpsManagerUiDrivers
   module Version17
     module Settings

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ops_manager_ui_drivers
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.2
 platform: ruby
 authors:
 - Pivotal, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-08 00:00:00.000000000 Z
+date: 2016-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -182,6 +182,7 @@ files:
 - bin/console
 - bin/setup
 - ci/run_specs.sh
+- lib/backport_refinements.rb
 - lib/ops_manager_ui_drivers.rb
 - lib/ops_manager_ui_drivers/logger.rb
 - lib/ops_manager_ui_drivers/page_helpers.rb