leap_salesforce_ui 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d7e63743b865e1a4fd706abeb9772fa5726a6304c336fe40dd6f32a455119b9
-  data.tar.gz: da6bfe38c4f2479a0ddb06e748ff262ac80d45fe9872839d115c0ccdb1eda758
+  metadata.gz: 86c39389d370e267d626261bc6b31d1e9507188f2a6ec1419a7abff1e1890372
+  data.tar.gz: fcf1b213f877ca3c7eab4edf1ce80e91b1be3eed46f411f6e8fd2adc767548b2
 SHA512:
-  metadata.gz: 9c0e05222bdb5c9c86f4367fc50a5e0bbb381d21329e7588cc4760011d636b4526aebe2e84db0ccf6ae60441186f673b6df70a73a1c370b3cbb54191d19f84c8
-  data.tar.gz: 78456a3a7afcd73a3e7b779843f17485f45b6c11b406038fa1ec43bdf2b8aee1b9cb6bef4fa66796f44c32f571591e6db1ce7b8b8f636d2064c3383dc85ddb6d
+  metadata.gz: 91701a2ec7d396345b8633edf1d25f2d9e05eb887dba96fdb9f8b9c488ebfc9331c7c4fb8fbd2aa3b87942172591f27b210278cf815bf13098c8e836cbb561b4
+  data.tar.gz: a04f7e04e7e34d4a29ea1667fa38fc9c6b3c60f8e2776dac1f077a3fbd4ea6e4cb552c98fb55dec6811e5eb6d439151acc7c7dfa75a4bffb683ccbbf70abd7ae

data/ChangeLog

@@ -1,3 +1,16 @@
+Version 0.2.0
+* Pass in security token defined by leap_salesforce with convention ENV['KEY'_token] to SOAP
+  session login
+
+Version 0.1.9
+* Ability to login through SOAP session with the LeapSalesforce.login_through_session parameter
+
+Version 0.1.8
+* Fixed Watir version at 6.19. Need to update syntax to work with latest version
+
+Version 0.1.7
+* Fixed filling in form for Salesforce's new layout
+
 Version 0.1.6
 * Bug fix
   * Not appending to Gemfile meant Rakefile could not load leap_salesfore_ui rake tasks

data/README.md

@@ -100,7 +100,7 @@ RSpec.describe "Creating record" do
 end
 ```
 
-One doesn’t have to identify how to recognise first_name, last_name, etc. 
+One does not have to identify how to recognise first_name, last_name, etc. 
 From the metadata it works out what kind of field (textfield, textarea, reference) and then 
 finds the corresponding label and uses that to fill in the field.
 
@@ -125,6 +125,31 @@ Follow other examples in `spec` to build tests using the auto-generated classes.
 unless run from an IP address that your Salesforce Org trusts. Many shared CI environments have runners that would
 be hard to whitelist as the address is dynamic.
 
+### Options
+
+To run tests in headless mode, set headless mode to true.
+```ruby
+LeapSalesforce.headless = true
+```
+
+### Authentication
+If IP address for user profile is not allowed you will need to use a security token. See
+leap_salesforce for how to set this for each user's key through environment variables. 
+
+### Helpful commands
+
+Go to Salesforce instance defined by logging in
+```ruby
+LeapSalesforce.browser.goto SoqlHandler.instance_url
+```
+
+Login through SOAP session to get information for browser
+```ruby
+user = LeapSalesforce::Users.where username: LeapSalesforce.ui_user
+session = LeapSalesforce::Session.new user.username, LeapSalesforce.password,
+                                      user.security_token
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. 

data/Rakefile

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_relative "config/credentials/token" if File.exist? 'config/credentials/token.rb'
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 require "leap_salesforce/rake"

data/leap_salesforce_ui.gemspec

@@ -29,8 +29,8 @@ It reads the Metadata from Salesforce and creates the foundation for UI tests.'
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "leap_salesforce", ">= 1.0.3"
-  spec.add_dependency "watir", ">= 6.17.0"
+  spec.add_dependency "leap_salesforce", ">= 1.2.1"
+  spec.add_dependency "watir", "6.19.1"
   spec.add_dependency "webdrivers"
 
   # For more information and examples about making a new gem, checkout our

data/lib/leap_salesforce_ui/form_filler.rb

@@ -55,7 +55,8 @@ module LeapSalesforce
     def set_text_area(label, value)
       LeapSalesforce.logger.info "Setting text area, label '#{label}' with '#{value}'"
       field_transaction label, value do
-        form.textarea(xpath: "//label[contains(.,'#{label}')]//following-sibling::textarea").set value
+        text_area = form.textarea(xpath: "//lightning-textarea[./label[contains(.,'#{label}')]]//following-sibling::div/textarea")
+        text_area.set value
       end
     end
 
@@ -88,11 +89,15 @@ module LeapSalesforce
     def set_picklist(label, value)
       LeapSalesforce.logger.info "Setting picklist, label '#{label}' with '#{value}'"
       field_transaction label, value do
-        dropdown = form.link(xpath: "//*[./*[text()='#{label}']]//following-sibling::div//a")
+        dropdown = form.text_field(xpath: "//*[./*[text()='#{label}']]//following-sibling::div//input")
+        dropdown_id = dropdown.attribute "id"
+        LeapSalesforce.logger.debug "Using dropdown id: #{dropdown_id}"
         dropdown.focus
         sleep 0.5
         dropdown.click
-        browser.link(xpath: ".//div[contains(@class, 'select-options')]//a[contains(.,'#{value}')]").click
+        has_value = "@data-value='#{value}'"
+        in_dropdown = "starts-with(@data-item-id, '#{dropdown_id}')"
+        browser.element(xpath: ".//lightning-base-combobox-item[#{has_value} and #{in_dropdown}]").click
       end
       self
     end
@@ -105,7 +110,7 @@ module LeapSalesforce
       field_transaction label, value do
         search_field = browser.text_field(xpath: "//label[contains(.,'#{ref_label}')]//following-sibling::div[1]//input")
         search_field.set search_val
-        browser.div(xpath: "//div[contains(@data-aura-class,'forceSearchInputLookupDesktopActionItem') and contains(., 'Search')]").click
+        browser.element(xpath: ".//lightning-base-combobox-item[starts-with(.,'SearchShow')]").click
         browser.link(xpath: "//div[contains(@class,'searchScroller')]//a[contains(.,'#{search_val}')]").click
       end
       self

data/lib/leap_salesforce_ui/login_page.rb

@@ -41,8 +41,18 @@ Go to #{DISABLE_2STEP_URL} to learn how to disable it"
     end
 
     def login
+      raise "Need to set LeapSalesforce.ui_user" unless LeapSalesforce.ui_user
       LeapSalesforce.logger.info "Logging in as user '#{LeapSalesforce.ui_user}'"
-      browser.goto "#{LeapSalesforce.general_url}/?un=#{LeapSalesforce.ui_user}&pw=#{LeapSalesforce.password}"
+      if LeapSalesforce.login_through_session
+        browser.goto SoqlHandler.instance_url
+        user = LeapSalesforce::Users.where username: LeapSalesforce.ui_user
+        session = LeapSalesforce::Session.new user.username, LeapSalesforce.password, user.security_token
+        browser.cookies.add "sid", session.session_id
+        browser.cookies.add "sidClient", session.user_id
+        browser.goto SoqlHandler.instance_url
+      else
+        browser.goto "#{LeapSalesforce.general_url}/?un=#{LeapSalesforce.ui_user}&pw=#{LeapSalesforce.password}"
+      end
       continue_button = browser.button(id: "thePage:inputForm:continue")
       if continue_button.exists?
         browser.checkbox(id: "thePage:inputForm:remember").set

data/lib/leap_salesforce_ui/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LeapSalesforceUi
-  VERSION = "0.1.6"
+  VERSION = "0.2.0"
 end

data/lib/leap_salesforce_ui.rb

@@ -35,6 +35,8 @@ module LeapSalesforce
   @ui_user = nil
   # @return [Boolean] Whether to run in headless mode
   @headless = false
+  # @return [Boolean] Whether to login using session obtained via SOAP
+  @login_through_session = false
   class << self
     def browser(test_name = nil)
       @browser ||= new_browser(test_name)
@@ -50,6 +52,8 @@ module LeapSalesforce
 
     # @return [Boolean] Whether to run in headless mode. Default false
     attr_accessor :headless
+    # @return [Boolean] Whether to login using session obtained via SOAP
+    attr_accessor :login_through_session
 
     # @param [String, Symbol, Regexp, LeapSalesforce::User] user User or email address of user
     def ui_user=(user)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: leap_salesforce_ui
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - IQA
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-23 00:00:00.000000000 Z
+date: 2022-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: leap_salesforce
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: watir
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 6.17.0
+        version: 6.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 6.17.0
+        version: 6.19.1
 - !ruby/object:Gem::Dependency
   name: webdrivers
   requirement: !ruby/object:Gem::Requirement