ops_manager_ui_drivers 1.27.0 → 1.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1759152579edac973cb280c2739aa124ede9bd99
-  data.tar.gz: d9c0e28827ce475a6f50e0bb10bc7af7ae4c055e
+  metadata.gz: 21a2cc7729f55038dd726791dc6d03c78789150c
+  data.tar.gz: 3f444295709edbc4254ba8ad73d0ff6e2243bf39
 SHA512:
-  metadata.gz: 0e9ae544ee237f523f16d0eba6b216d2b4125300d22e9057a1c07c66f24d2b13066931b778bc4104f7eba3093d508d531bf4169d797eba354f2bd624bcbc4dc3
-  data.tar.gz: 3a31071e5cbb4b4284bd3f371959cc77ac0ab7bd9e9dbba6f4876aa853804f5aaece61eef401e6a24e64f63bfd11ecef2e980fa075d2319a5109a86f695b94c9
+  metadata.gz: f4904aba2cd6d3a964dbc57dc2e44893cc7a197abfdd0e48453eb8eddd7fcbd143b68b5c0a682441eee3093036afa41221947d5d9d53fdcc16db59b4cef6686e
+  data.tar.gz: 14f79d8e4cd070d2557ad0e28a3316e9ff150b82df501db82835a4a9ad5647311655a8d4da22a497c909762289708ebc3461a86751db61bd6c25a769091dd8c3

data/lib/ops_manager_ui_drivers/version.rb

@@ -1,3 +1,3 @@
 module OpsManagerUiDrivers
-  VERSION = '1.27.0'
+  VERSION = '1.28.0'
 end

data/lib/ops_manager_ui_drivers/version17/api.rb

@@ -1,4 +1,5 @@
 require 'ops_manager_ui_drivers/version16/api'
+require 'uaa'
 
 module OpsManagerUiDrivers
   module Version17
@@ -9,14 +10,38 @@ module OpsManagerUiDrivers
         http.request(put(feature_flag_path, enabled: value))
       end
 
+      def get_products
+        http.request(get('v0/products'), uaa_token.auth_header)
+      end
+
       private
 
-      def put(endpoint, form_data)
+      def uaa_token
+        target_url = @host_uri.to_s + '/uaa'
+        token_issuer = CF::UAA::TokenIssuer.new(target_url, 'opsman', nil, {:skip_ssl_validation => true})
+        token_issuer.owner_password_grant('admin', 'admin')
+      end
+
+      def get(endpoint, token=nil)
+        Net::HTTP::Get.new(api_uri(endpoint).request_uri).tap do |get|
+          add_auth_to_request(get, token)
+        end
+      end
+
+      def put(endpoint, form_data, token=nil)
         Net::HTTP::Put.new(api_uri(endpoint).request_uri).tap do |put_request|
-          put_request.basic_auth(@username, @password)
+          add_auth_to_request(put_request, token)
           put_request.set_form_data(form_data)
         end
       end
+
+      def add_auth_to_request(request, token)
+        if token.present?
+          request['Authorization'] = token
+        else
+          request.basic_auth(@username, @password)
+        end
+      end
     end
   end
 end

data/lib/ops_manager_ui_drivers/version17/setup.rb

@@ -3,13 +3,13 @@ require 'ops_manager_ui_drivers/version16/setup'
 module OpsManagerUiDrivers
   module Version17
     class Setup < Version16::Setup
-      def setup_and_login(user:, password:)
+      def setup_and_login(user:, password:, decryption_passphrase: password)
         browser.visit '/setup'
         browser.fill_in 'setup[admin_user_name]', with: user, wait: 4
         browser.fill_in 'setup[admin_password]', with: password
         browser.fill_in 'setup[admin_password_confirmation]', with: password
-        browser.fill_in 'setup[decryption_passphrase]', with: password
-        browser.fill_in 'setup[decryption_passphrase_confirmation]', with: password
+        browser.fill_in 'setup[decryption_passphrase]', with: decryption_passphrase
+        browser.fill_in 'setup[decryption_passphrase_confirmation]', with: decryption_passphrase
         browser.check 'setup_eula_accepted'
         browser.click_on 'create-setup-action'
 
@@ -31,15 +31,25 @@ module OpsManagerUiDrivers
         end
       end
 
-      def setup_or_login(user:, password:)
+      def setup_or_login(user:, password:, decryption_passphrase: password)
         browser.visit '/'
 
         if browser.current_path == '/setup'
-          setup_and_login(user: user, password: password)
+          setup_and_login(user: user, password: password, decryption_passphrase: decryption_passphrase)
+        elsif browser.current_path == '/unlock'
+          unlock_and_login(user: user, password: password, decryption_passphrase: decryption_passphrase)
         elsif browser.current_path == '/uaa/login'
           login(user: user, password: password)
         end
       end
+
+      private
+
+      def unlock_and_login(user:, password:, decryption_passphrase: password)
+        browser.fill_in 'login[passphrase]', with: decryption_passphrase
+        browser.click_on 'Login'
+        login(user: user, password: password) unless browser.has_selector?('#main-page-marker', wait: 1)
+      end
     end
   end
 end

data/ops_manager_ui_drivers.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'capybara'
   spec.add_dependency 'capybara-webkit'
   spec.add_dependency 'selenium-webdriver'
+  spec.add_dependency 'cf-uaa-lib'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'codeclimate-test-reporter'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ops_manager_ui_drivers
 version: !ruby/object:Gem::Version
-  version: 1.27.0
+  version: 1.28.0
 platform: ruby
 authors:
 - Pivotal, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-24 00:00:00.000000000 Z
+date: 2016-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: cf-uaa-lib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement