leap_salesforce_ui 0.1.5 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 526d7426b4cbc68a811661af10184c81150a07d5b9f7441909758a84a6ff6353
-  data.tar.gz: '0248a74aeaf95af16ac34ffecac449710687283b3b27bedef3bb0814e4d95106'
+  metadata.gz: a32b636aadfb8ad4d0a4cdbbacf3d5be6bd826b6ba68beb87229df3d16c35c9f
+  data.tar.gz: 1fb0bbfcccc439e62971da6c2fa044431f7f3a03aa899b2051be5e2568bfe50f
 SHA512:
-  metadata.gz: 829da20fbece1a80e9e01e099d6bbdaf1d1f949670c9e91ac09d37154dd194c62fe91e9a5dd65586dc53a1597e80a3a2e0d9aa6b6fead07d61aa32cc0b051a76
-  data.tar.gz: 0612cb14198ae7ec1cd0200ec952661346262aefab0c746f4e4fb3ded1a4d7269bb1c925bf593ab3280dfc7c37f4ce5a261b8585f4dd11119ddc514b84602272
+  metadata.gz: dbd02870870749274f24409c049899773df5080b0af2ecce9f98007ccbee275b3ac69dfcfddb4de5633a81c6ffd6f37bbeb195f496fcc6f3e1b86bf9fa823338
+  data.tar.gz: 4d9e90c2ee97d6f372f9951d15dc5bef78f3b08aef3253a7604cd9b4c31b0cf4bb61858970bb3cbe6877aefdd3879d629c3464b55ee1a4b347aa3dc0c57077bd

data/ChangeLog

@@ -1,3 +1,16 @@
+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
+
 Version 0.1.5
 * Enhancements
   * Added logging of actions

data/README.md

@@ -125,6 +125,26 @@ 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
+```
+
+
+### Helpful commands
+
+Go to Salesforce instance defined by logging in
+```ruby
+LeapSalesforce.browser.goto SoqlHandler.instance_url
+```
+
+```ruby
+
+session = LeapSalesforce::Session.new LeapSalesforce.ui_user, LeapSalesforce.password
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. 

data/exe/leap_salesforce_ui

@@ -31,6 +31,7 @@ module LeapSalesforce
     def init
       puts "Initialising initial files to get started with leap_salesforce_ui"
       append "Rakefile", "Rakefile.erb"
+      append "Gemfile", "Gemfile.erb"
       puts 'Running Rake task "leaps:create_poms"'
       puts `rake leaps:create_poms`
       append File.join("spec", "spec_helper.rb"), "spec_helper.rb.erb"

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.1.2"
+  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/generator/appenders.rb

@@ -10,12 +10,16 @@ module LeapSalesforce
 
       # Create content in a file, adding to an existing file if present
       def append(filename, template_path)
-        FileUtils.touch filename unless File.exist? filename
+        verb = "Appending to"
+        unless File.exist? filename
+          FileUtils.touch filename
+          verb = "Creating"
+        end
         content = read_template template_path, binding, folder: __dir__
         if File.read(filename).include?(content)
           puts "File '#{filename}' already has expected content, skipping...".colorize :red
         else
-          puts "\u2713 Appending to #{filename}".colorize :green
+          puts "\u2713 #{verb} #{filename}".colorize :green
           open(filename, "a") { |f| f.puts content }
         end
       end

data/lib/leap_salesforce_ui/generator/templates/Gemfile.erb

@@ -0,0 +1 @@
+gem 'leap_salesforce_ui'

data/lib/leap_salesforce_ui/login_page.rb

@@ -41,8 +41,17 @@ 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
+        session = LeapSalesforce::Session.new LeapSalesforce.ui_user, LeapSalesforce.password
+        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.5"
+  VERSION = "0.1.9"
 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.5
+  version: 0.1.9
 platform: ruby
 authors:
 - IQA
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-16 00:00:00.000000000 Z
+date: 2022-02-01 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.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.1.2
 - !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
@@ -91,6 +91,7 @@ files:
 - lib/leap_salesforce_ui/form_filler.rb
 - lib/leap_salesforce_ui/generator/appenders.rb
 - lib/leap_salesforce_ui/generator/page_objects.rb
+- lib/leap_salesforce_ui/generator/templates/Gemfile.erb
 - lib/leap_salesforce_ui/generator/templates/Rakefile.erb
 - lib/leap_salesforce_ui/generator/templates/create_page.rb.erb
 - lib/leap_salesforce_ui/generator/templates/spec_helper.rb.erb