prof 0.30.6 → 0.30.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e844df58b63e8b0f8819830ee5ba8122bc89e55a
-  data.tar.gz: bde66b9a79de335d09f59b9ffc59a17d01840c6c
+  metadata.gz: 1415f762d89b855b9d748288c8da924a1f3f29f6
+  data.tar.gz: 5a8a74f6120097a1f73e88a24021ec2266c9db92
 SHA512:
-  metadata.gz: 41a1d8634b46d10379818ea7c1e7d996961b9b322b0dc450911f87928d80397d255199605fe577d2295dc5b797b9f09adc9fb22f6183ceaaf746ac726aa211ab
-  data.tar.gz: 23e280c3a22368ee84aafb6066ec55882e0ffacaf6e0d2799de8e5c234b734aa46ba9bddc84a95c9b40177f703ea7b66bb11a8d72a2457ad4cee955daf560766
+  metadata.gz: d981a5a9bfa254b3b0cca4129884bfb859ba60288bd148f8e3224e91ae96858251281935cdce00c226c71b416a8d02cd4741e0e1132bad49cabb1a6cfb77feec
+  data.tar.gz: ec32875d427f74865e2cdc4e92e18c041946c7fe75b36ae2bdc8b416e250b7cf6005cf9bde9e592e3656b3d0c03808fdc2de3c0fc21fb87caccf2e91507ea938

data/lib/prof/ops_manager.rb

@@ -21,12 +21,13 @@ module Prof
   class OpsManager
     extend Forwardable
 
-    def initialize(url:, username:, password:, page: default_capybara_session, log_fetcher: null_log_fetcher)
+    def initialize(url:, username:, password:, page: default_capybara_session, log_fetcher: null_log_fetcher, version: "1.6")
       @url         = url
       @username    = username
       @password    = password
       @page        = page
       @log_fetcher = log_fetcher
+      @version     = Gem::Version.new(version)
     end
 
     attr_reader :url
@@ -107,7 +108,7 @@ module Prof
 
     private
 
-    attr_reader :username, :password, :page, :log_fetcher
+    attr_reader :username, :password, :page, :log_fetcher, :version
 
     def default_capybara_session
       Capybara::Session.new(Capybara.default_driver)
@@ -126,7 +127,7 @@ module Prof
     end
 
     def login_page
-      @login_page ||= WebAppInternals::Page::Login.new(page: page, url: url, username: username, password: password)
+      @login_page ||= WebAppInternals::Page::Login.new(page: page, url: url, username: username, password: password, version: version)
     end
 
     def null_log_fetcher

data/lib/prof/ops_manager/web_app_internals/page/login.rb

@@ -9,7 +9,6 @@
 #
 
 require 'uri'
-
 require 'prof/ops_manager/web_app_internals/page/dashboard'
 
 module Prof
@@ -17,11 +16,12 @@ module Prof
     class WebAppInternals
       module Page
         class Login
-          def initialize(page:, url:, username:, password:)
+          def initialize(page:, url:, username:, password:, version:)
             @page     = page
             @url      = url
             @username = username
             @password = password
+            @version  = version
 
             resp = page.visit login_url
 
@@ -32,20 +32,50 @@ module Prof
 
           def login
             puts "Logging into tempest at #{login_url}"
-            page.fill_in 'login[user_name]', with: username
-            page.fill_in 'login[password]', with: password
-            page.click_on 'login-action'
+            if login_via_uaa?
+              uaa_login
+            else
+              basic_login
+            end
 
             Dashboard.new(page: page)
           end
 
           private
 
-          attr_reader :page, :url, :username, :password
+          attr_reader :page, :url, :username, :password, :version
 
           def login_url
+            if login_via_uaa?
+              uaa_login_url
+            else
+              basic_login_url
+            end
+          end
+
+          def login_via_uaa?
+            version >= Gem::Version.new("1.7")
+          end
+
+          def uaa_login_url
+            URI.join(url, "uaa/login")
+          end
+
+          def basic_login_url
             URI.join(url, 'login')
           end
+
+          def uaa_login
+            page.fill_in 'username', with: username
+            page.fill_in 'password', with: password
+            page.click_on 'Sign in'
+          end
+
+          def basic_login
+            page.fill_in 'login[user_name]', with: username
+            page.fill_in 'login[password]', with: password
+            page.click_on 'login-action'
+          end
         end
       end
     end

data/lib/prof/ops_manager/web_app_internals/page/tile_settings.rb

@@ -59,7 +59,7 @@ module Prof
           def sidebar(next_settings_name, &_block)
             return self if next_settings_name == current_setting_name
 
-            page.find('li a', text: /^\s*#{next_settings_name}\s*$/).click
+            page.find('.sidebar li a', text: /^\s*#{next_settings_name}\s*$/).click
 
             if block_given?
               yield page

data/lib/prof/version.rb

@@ -9,5 +9,5 @@
 #
 
 module Prof
-  VERSION = '0.30.6'
+  VERSION = '0.30.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prof
 version: !ruby/object:Gem::Version
-  version: 0.30.6
+  version: 0.30.7
 platform: ruby
 authors:
 - CF London
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-18 00:00:00.000000000 Z
+date: 2016-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem-release