leap_salesforce_ui 0.1.4 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3481b31ac19a98f7d9fe40b017f0d9d2d047a50a891ed20e079aaee480c0c623
-  data.tar.gz: 72ec8083bcfe9155f7e631fd5354c9d8388104bf9007985440a2518e902576f8
+  metadata.gz: 4b5f251c39643a21857de6fe166d4bd7e7b745a124447c8902e1c37b668e9505
+  data.tar.gz: 0ede5e19a5b0ad7bde0c7225839b3491befddf121f841a814553b7f61b4ebff4
 SHA512:
-  metadata.gz: 34b181f68921877a0e0afe55fd9e4ce91f3273323065c034f8dd63e0e0b85341e1ca27187b6f8e773e25816935615c6e33baf7aab262cf65244eebfdc217de2b
-  data.tar.gz: 9d7d119547de5453559936160ecc520e6d0db99620050c38b6297998b3f99e3e5938bb6875621bc2cdbee698c2d6e1f817743291fa15fb6c08a1435be39d2cd6
+  metadata.gz: 74c998b5c42ec3d31f3c4e730c294b05cbcaae389a7be5dc9c8425f0a8f994618694b1e4fc0274649705fa0ab4d558e159c69a133907a4de5ae3521a7511fffb
+  data.tar.gz: 5604e708d5d9c28cf03d797cbff9373e33e4481e69b99ebbee961df091eb30f0c8a97ae504bea2025995b4edf43f979002e8fd75d1e513110a4d43a7cd077065

data/.leap_salesforce.yml

@@ -4,3 +4,4 @@ sfdx: false
 soql_objects:
   - Contact
   - Account
+  - Broker: Broker__c

data/ChangeLog

@@ -1,3 +1,21 @@
+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
+  * Allow headless mode with LeapSalesforce.headless = true
+  * Throw custom errors when problem occurs setting fields
+* Bug fix
+  * Didn't handle where class name and backend name differ
+
 Version 0.1.4
 * Enhancements
   * Add executable to make it fast to setup testing with exe `leap_salesforce_ui init`

data/README.md

@@ -125,6 +125,14 @@ 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
+```
+
+
 ## 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

@@ -30,7 +30,7 @@ It reads the Metadata from Salesforce and creates the foundation for UI tests.'
   spec.require_paths = ["lib"]
 
   spec.add_dependency "leap_salesforce", ">= 1.0.3"
-  spec.add_dependency "watir", ">= 6.17.0"
+  spec.add_dependency "watir", "6.19"
   spec.add_dependency "webdrivers"
 
   # For more information and examples about making a new gem, checkout our

data/lib/leap_salesforce_ui/base_page.rb

@@ -8,13 +8,17 @@ module BasePage
     LeapSalesforce.browser
   end
 
+  # Set entity this page object refers to
+  # @param [Class] soql_object Backend name of SoqlObject this page object refers to
   def soql_object(soql_object)
     @soql_object = soql_object
   end
 
+  # Visit the current page, logging in if required
   def visit
     LoginPage.login
-    page_url = "#{SoqlHandler.instance_url}/lightning/o/#{@soql_object}/new"
+    page_url = "#{SoqlHandler.instance_url}/lightning/o/#{@soql_object.soql_object_name}/new"
+    LeapSalesforce.logger.info "Visiting #{self}"
     browser.goto page_url
     self
   end

data/lib/leap_salesforce_ui/error.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module LeapSalesforce
+  # Error related to submitting a form
+  class SubmitError < Error; end
+
+  # Error related to setting a field
+  class SetFieldError < Error; end
+end

data/lib/leap_salesforce_ui/form_filler.rb

@@ -2,7 +2,8 @@
 
 module LeapSalesforce
   module FormFiller
-    def new_panel
+    # @return [Watir::Elements::Div] Div where form entered to create/edit entity
+    def form
       browser.div(class: "inlinePanel")
     end
 
@@ -27,7 +28,8 @@ module LeapSalesforce
     end
 
     # Based on data type of field passed, fill in each field
-    # @param [Hash] data
+    # The type of field is attempted to be filled in based on the metadata
+    # @param [Hash] data Hash with label => value to set syntax.
     def populate_with(data)
       sleep 1 # Being too fast can cause issues with first value. TODO: Wait for a condition
       data.each do |desc, value|
@@ -36,28 +38,48 @@ module LeapSalesforce
 
         type = field[:type] || field["type"]
         case type
-        when "string"
-          set_text_field(label_name, value)
+        when "string" then set_text_field(label_name, value)
         when "picklist" then set_picklist(label_name, value)
-        when "textarea"
-          new_panel.textarea(xpath: "//label[contains(.,'#{label_name}')]//following-sibling::textarea").set value
-        when "reference"
-          set_reference_field(label_name, value)
+        when "textarea" then set_text_area(label_name, value)
+        when "reference" then set_reference_field(label_name, value)
         else
-          raise NotImplementedError, "#{type} not yet defined in #{self.class}"
+          raise NotImplementedError, "#{type} not yet defined in #{self}"
         end
       end
       self
     end
 
-    def set_text_field(label, value)
-      text_field = new_panel.text_field(xpath: "//label[contains(.,'#{label}')]//following-sibling::input")
-      text_field.focus
-      text_field.set! value
-      return self if text_field.value == value
+    # Set input text field
+    # @param [String] label Label of textfield
+    # @param [String] value Value to set textfield to
+    def set_text_area(label, value)
+      LeapSalesforce.logger.info "Setting text area, label '#{label}' with '#{value}'"
+      field_transaction label, value do
+        text_area = form.textarea(xpath: "//lightning-textarea[./label[contains(.,'#{label}')]]//following-sibling::div/textarea")
+        text_area.set value
+      end
+    end
 
-      sleep 2 # Wait a bit and then set field
-      text_field.set! value
+    # Set input text field
+    # @param [String] label Label of text field
+    # @param [String] value Value to set text field to
+    def set_text_field(label, value)
+      value = value.to_s
+      LeapSalesforce.logger.info "Setting text field, label '#{label}' with '#{value}'"
+      field_transaction label, value do
+        label_element = form.label(xpath: "//label[contains(.,'#{label}')]")
+        text_field = label_element.text_field(xpath: ".//following-sibling::input|.//following-sibling::div/input")
+        text_field.focus
+        text_field.set! value
+        return self if text_field.value == value
+
+        sleep 2 # Wait a bit and then set field
+        text_field.set! value
+        unless text_field.value == value
+          raise SetFieldError, "Unable to set text field '#{label}' with value " \
+                               "'#{value}'. Value set is '#{text_field.value}'"
+        end
+      end
       self
     end
 
@@ -65,21 +87,32 @@ module LeapSalesforce
     # @param [String] label Label of picklist
     # @param [String] value Value to set picklist to
     def set_picklist(label, value)
-      dropdown = new_panel.link(xpath: "//*[./*[text()='#{label}']]//following-sibling::div//a")
-      dropdown.focus
-      sleep 0.5
-      dropdown.click
-      browser.link(xpath: ".//div[contains(@class, 'select-options')]//a[contains(.,'#{value}')]").click
+      LeapSalesforce.logger.info "Setting picklist, label '#{label}' with '#{value}'"
+      field_transaction label, value do
+        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
+        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
 
+    # Set reference field where another entity is referred to by this entity
     def set_reference_field(label, value)
       ref_label = label.gsub("ID", "Name")
       search_val = value[0..12]
-      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.link(xpath: "//div[contains(@class,'searchScroller')]//a[contains(.,'#{search_val}')]").click
+      LeapSalesforce.logger.info "Setting reference field, label '#{ref_label}', searching with '#{search_val}'"
+      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.element(xpath: ".//lightning-base-combobox-item[starts-with(.,'SearchShow')]").click
+        browser.link(xpath: "//div[contains(@class,'searchScroller')]//a[contains(.,'#{search_val}')]").click
+      end
       self
     end
 
@@ -88,20 +121,37 @@ module LeapSalesforce
       save
     end
 
+    # @return [Watir::Elements::Ul] List of errors
+    def error_list
+      browser.ul(xpath: "//ul[contains(@class, 'errorsList') and not(normalize-space()='')]")
+    end
+
     # Save the current form, creating the new object
     def save
-      browser.button(title: "Save").click
-      new_panel.wait_until do |panel|
-        browser_list = browser.ul(class: "errorsList")
-        if browser_list.exists?
-          sleep 3
-          errors = browser_list.lis
-          sleep 1 if errors.collect(&:text) != [""] # Wait for error to come
-          raise "Errors creating: #{errors.collect(&:text)}" if errors.count.positive?
+      LeapSalesforce.logger.info "Saving form for #{self}"
+      form.button(xpath: "//button[@title='Save']|//button[text()='Save']").click
+      form.wait_until do |panel|
+        sleep 1.5
+        if error_list.exists?
+          errors = error_list.lis
+          error_text = errors.collect(&:text)
+          LeapSalesforce.logger.error "Error submitting #{self} #{error_list.text}"
+          raise LeapSalesforce::SubmitError, "Errors creating on #{self}: #{error_text}" if errors.count.positive?
         end
 
         !panel.present?
       end
     end
+
+    private
+
+    # Process of setting a field within this block. Exceptions will be caught
+    # and thrown with context specific information
+    def field_transaction(label, value)
+      yield
+    rescue Watir::Exception::Error => e
+      raise LeapSalesforce::SetFieldError, "Unable to set label '#{label}' to '#{value}'" \
+                                           " on #{self}. Due to #{e.inspect}"
+    end
   end
 end

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,6 +41,7 @@ Go to #{DISABLE_2STEP_URL} to learn how to disable it"
     end
 
     def login
+      LeapSalesforce.logger.info "Logging in as user '#{LeapSalesforce.ui_user}'"
       browser.goto "#{LeapSalesforce.general_url}/?un=#{LeapSalesforce.ui_user}&pw=#{LeapSalesforce.password}"
       continue_button = browser.button(id: "thePage:inputForm:continue")
       if continue_button.exists?

data/lib/leap_salesforce_ui/update_page.rb

@@ -9,7 +9,7 @@ class UpdatePage
   class << self
     def visit(id)
       LoginPage.login
-      browser.goto "#{SoqlHandler.instance_url}/lightning/r/#{@soql_object}/#{id}/edit"
+      browser.goto "#{SoqlHandler.instance_url}/lightning/r/#{@soql_object.soql_object_name}/#{id}/edit"
       self
     end
   end

data/lib/leap_salesforce_ui/version.rb

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

data/lib/leap_salesforce_ui/view_page.rb

@@ -7,7 +7,7 @@ class ViewPage
   class << self
     def visit(id)
       LoginPage.login
-      browser.goto "#{SoqlHandler.instance_url}lightning/r/#{@soql_object}/#{id}/view"
+      browser.goto "#{SoqlHandler.instance_url}lightning/r/#{@soql_object.soql_object_name}/#{id}/view"
       self
     end
   end

data/lib/leap_salesforce_ui.rb

@@ -4,6 +4,7 @@ require "watir"
 require "webdrivers"
 require "leap_salesforce"
 require_relative "leap_salesforce_ui/version"
+require_relative "leap_salesforce_ui/error"
 require_relative "leap_salesforce_ui/base_page"
 require_relative "leap_salesforce_ui/page_introspection"
 require_relative "leap_salesforce_ui/form_filler"
@@ -32,6 +33,8 @@ end
 module LeapSalesforce
   # @return [String] User for UI
   @ui_user = nil
+  # @return [Boolean] Whether to run in headless mode
+  @headless = false
   class << self
     def browser(test_name = nil)
       @browser ||= new_browser(test_name)
@@ -42,8 +45,12 @@ module LeapSalesforce
       @browser = nil
     end
 
+    # @return [String] User used for UI tests
     attr_reader :ui_user
 
+    # @return [Boolean] Whether to run in headless mode. Default false
+    attr_accessor :headless
+
     # @param [String, Symbol, Regexp, LeapSalesforce::User] user User or email address of user
     def ui_user=(user)
       @ui_user = if user.is_a? String
@@ -61,7 +68,9 @@ module LeapSalesforce
         # TODO: Get working on Ruby 3
         Watir::Browser.new :chrome, { **zalenium_args("LeapSalesforce", test_name || "Test") }
       else
-        Watir::Browser.new
+        args = {}
+        args[:headless] = true if headless
+        Watir::Browser.new :chrome, args
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: leap_salesforce_ui
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.8
 platform: ruby
 authors:
 - IQA
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-12 00:00:00.000000000 Z
+date: 2022-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: leap_salesforce
@@ -29,16 +29,16 @@ dependencies:
   name: watir
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 6.17.0
+        version: '6.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 6.17.0
+        version: '6.19'
 - !ruby/object:Gem::Dependency
   name: webdrivers
   requirement: !ruby/object:Gem::Requirement
@@ -87,9 +87,11 @@ files:
 - lib/leap_salesforce_ui.rb
 - lib/leap_salesforce_ui/base_page.rb
 - lib/leap_salesforce_ui/create_page.rb
+- lib/leap_salesforce_ui/error.rb
 - 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
@@ -126,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Helps with setting up integrated automated test frameworks against Salesforce