effective_test_bot 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a58127dee25edf6d59d56186bdadc7c6b20b46008d78757e9f29471ab4c77d08
-  data.tar.gz: ac0be189890058266890718946bb912bf34105ff39720a92a9041ae16e8ab973
+  metadata.gz: 4ca4801862674dc8fc51f92efc4240d754b3308221ff9dd3860f99ac61a2a66c
+  data.tar.gz: 1cf30b273097f94620dd075945bb468026615692f4a113df883a36d5a72caf07
 SHA512:
-  metadata.gz: 4e039db2969eb5f7f3e1cebaaddb2d20987c2bafd05fac9832addf84c8b76632debad04a4988c60d5e647436e8bd01c1548fc067095d288dedf9167c1690f413
-  data.tar.gz: 4e5ca33c5de04e4e0fab7831a855bf6254a1c1ad94d8fd9c4b3e4b22546c17e24405cf9d43bf8530ff878a91bc930c92d2bfaa1271d12d9c1b615ff2b6edc070
+  metadata.gz: 225ab57659a51d3fb7af5648ac4116abb7c2cf05ab9c32aef6c2f79fdfedeacefd180dafbdd43e0be7fd85f298a7015a3dc326766bfa185576ff662256e5e4f4
+  data.tar.gz: 3b7100066628df695c8c0f01e14ea0ad69808ab057c5b765f80c346bf915e4d1c13c5fa89804ff80dbe18ae6b7a5e6df2914845b4f812f3303293fb7a47de871

data/README.md

@@ -27,7 +27,7 @@ This is the 1.0 series of effective_test_bot.
 
 This requires Rails 5.1+
 
-Please check out [Effective TestBot Capybara-Webkit branch](https://github.com/code-and-effect/effective_test_bot/tree/capybara-webit) for more information using this gem with Capybara Webkit and Rails < 5.1.
+Please check out [Effective TestBot Capybara-Webkit branch](https://github.com/code-and-effect/effective_test_bot/tree/capybara-webkit) for more information using this gem with Capybara Webkit and Rails < 5.1.
 
 This works with Rails 6.0.0.rc1 and parallelization.
 

data/lib/effective_test_bot.rb

@@ -95,7 +95,7 @@ module EffectiveTestBot
 
   def self.tour_mode?
     if ENV['TOUR'].present?
-      ['true', 'verbose', 'debug'].include?(ENV['TOUR'].to_s.downcase)
+      ['true', 'extreme', 'verbose', 'debug'].include?(ENV['TOUR'].to_s.downcase)
     else
       screenshots? && (tour_mode != false)
     end

data/lib/effective_test_bot/dsl.rb

@@ -4,8 +4,9 @@ module EffectiveTestBot
 
     included do
       include EffectiveTestBotAssertions
-      include EffectiveTestBotFormHelper
+      include EffectiveTestBotFormFaker
       include EffectiveTestBotFormFiller
+      include EffectiveTestBotFormHelper
       include EffectiveTestBotLoginHelper
       include EffectiveTestBotMinitestHelper
       include EffectiveTestBotScreenshotsHelper

data/lib/effective_test_bot/version.rb

@@ -1,3 +1,3 @@
 module EffectiveTestBot
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.1.1'.freeze
 end

data/test/support/effective_test_bot_form_faker.rb

@@ -0,0 +1,271 @@
+# This is all private stuff. See effective_test_bot_form_helper.rb for public DSL
+
+require 'faker'
+
+module EffectiveTestBotFormFaker
+  DIGITS = ('1'..'9').to_a
+  LETTERS = %w(A B C E G H J K L M N P R S T V X Y) # valid letters of a canadian postal code, eh?
+
+  # Generates an appropriately pseudo-random value for the given field
+  # Pass in a Hash of fills to define pre-selected values
+  #
+  # Operates on just string keys, no symbols here
+  def faker_value_for_field(field, fills = {})
+    field_name = [field.tag_name, field['type']].compact.join('_')
+    attributes = field['name'].to_s.gsub(']', '').split('[') # user[something_attributes][last_name] => ['user', 'something_attributes', 'last_name']
+    attribute = attributes.last.to_s
+
+    fill_value = fill_value_for_field(fills, attributes, field['value'], field_name)
+
+    # If there is a predefined fill value for this field return it now
+    # except for select, checkbox and radio fields which we want to match by value or label
+    if fill_value.present? && !['select', 'input_checkbox', 'input_radio'].include?(field_name)
+      return fill_value
+    end
+
+    case field_name
+    when 'input_text'
+      classes = field['class'].to_s.split(' ')
+
+      if classes.include?('date') # Let's assume this is a date input.
+        if attribute.include?('end') || attribute.include?('expire') # Make sure end dates are after start dates
+          Faker::Date.forward(365).strftime('%Y-%m-%d')
+        else
+          Faker::Date.backward(365).strftime('%Y-%m-%d')
+        end
+      elsif classes.include?('datetime')
+        if attribute.include?('end') || attribute.include?('expire')
+          Faker::Date.forward(365).strftime('%Y-%m-%d %H:%m')
+        else
+          Faker::Date.backward(365).strftime('%Y-%m-%d %H:%m')
+        end
+      elsif classes.include?('numeric')
+        value_for_input_numeric_field(field, "input.numeric[name$='[#{attribute}]']")
+      elsif classes.include?('email') || attribute.include?('email')
+        Faker::Internet.email
+      elsif classes.include?('price') # effective_form_inputs price
+        4.times.map { DIGITS.sample }.join('') + '.00'
+      elsif classes.include?('numeric') || attribute.include?('number')
+        min = (Float(field['min']) rescue 1)
+        max = (Float(field['max']) rescue 1000)
+        number = Random.new.rand(min..max)
+        number.kind_of?(Float) ? number.round(2) : number
+      elsif attribute.include?('first_name')
+        Faker::Name.first_name
+      elsif attribute.include?('last_name')
+        Faker::Name.last_name
+      elsif attribute.include?('website')
+        Faker::Internet.url
+      elsif attribute.include?('city')
+        Faker::Address.city
+      elsif attribute.include?('address2')
+        Faker::Address.secondary_address
+      elsif attribute.include?('address')
+        Faker::Address.street_address
+      elsif attribute.include?('name')
+        Faker::Name.name
+      elsif attribute.include?('postal_code')
+        if @filled_country_fields == 'US'
+          DIGITS.sample + DIGITS.sample + DIGITS.sample + DIGITS.sample + DIGITS.sample
+        else
+          LETTERS.sample + DIGITS.sample + LETTERS.sample + ' ' + DIGITS.sample + LETTERS.sample + DIGITS.sample
+        end
+      elsif attribute.include?('postal') # Make a Canadian postal code
+        LETTERS.sample + DIGITS.sample + LETTERS.sample + ' ' + DIGITS.sample + LETTERS.sample + DIGITS.sample
+      elsif attribute.include?('zip') && attribute.include?('code') # Make a US zip code
+        DIGITS.sample + DIGITS.sample + DIGITS.sample + DIGITS.sample + DIGITS.sample
+      elsif attribute.include?('social_insurance_number') || attributes.include?('sin_number')
+        "#{DIGITS.sample(3).join} #{DIGITS.sample(3).join} #{DIGITS.sample(3).join}"
+      elsif attribute.include?('slug')
+        Faker::Lorem.words(3).join(' ').parameterize
+      else
+        Faker::Lorem.words(3).join(' ').capitalize
+      end
+
+    when 'input_checkbox'
+      value_for_input_checkbox_field(field, fill_value)
+
+    when 'input_color'
+      Faker::Color.hex_color
+
+    when 'input_email'
+      Faker::Internet.email
+
+    when 'input_file'
+      if field['class'].to_s.include?('asset-box-uploader-fileinput')
+        "#{File.dirname(__FILE__).sub('test/support', 'test/fixtures')}/documents._test"
+      else
+        "#{File.dirname(__FILE__).sub('test/support', 'test/fixtures')}/logo.png"
+      end
+
+    when 'input_number'
+      value_for_input_numeric_field(field, "input[type='number'][name$='[#{attribute}]']")
+
+    when 'input_password'
+      # Use the same password throughout a single test. Allows passwords and password_confirmations to match.
+      @filled_password_fields ||= Faker::Internet.password
+
+    when 'input_radio'
+      value_for_input_radio_field(field, fill_value)
+
+    when 'select', 'select_select-one'
+      value_for_input_select_field(field, fill_value)
+
+    when 'select_select-multiple'
+      1.upto(3).to_a.map { value_for_input_select_field(field, fill_value) }.uniq
+
+    when 'input_tel'
+      d = 10.times.map { DIGITS.sample }
+      d[0] + d[1] + d[2] + '-' + d[3] + d[4] + d[5] + '-' + d[6] + d[7] + d[8] + d[9]
+
+    when 'input_url'
+      Faker::Internet.url
+
+    when 'textarea', 'textarea_textarea'
+      Faker::Lorem.paragraph
+
+    when 'input_submit', 'input_search', 'input_button'
+      nil
+
+    else
+      raise "fill_value unsupported field type: #{field_name}"
+    end
+  end
+
+  private
+
+  def fill_value_for_field(fills, attributes, value, field_name)
+    return if fills.blank? || (attributes.blank? && value.blank?)
+
+    key = nil
+    attributes.reverse_each do |name|  # match last_name, then something_attributes.last_name, then user.something_attributes.last_name
+      key = (key.present? ? "#{name}.#{key}" : name) # builds up the string as we go along
+
+      return :unselect if field_name == 'select' && fills.key?(key) && [nil, ''].include?(fills[key])
+      return fills[key].to_s if fills.key?(key)
+    end
+
+    return fills[value] if fills.key?(value)
+
+    nil
+  end
+
+  def value_for_input_select_field(field, fill_value)
+    return fill_value if fill_value == :unselect
+    country_code = field['name'].to_s.include?('country_code')
+
+    if fill_value.present? # accept a value or text
+      field.all('option:enabled').each do |option|
+        if (option.text == fill_value || option.value.to_s == fill_value)
+          @filled_country_fields = option.value if country_code
+          return option.text
+        end
+      end
+    end
+
+    option = field.all('option:enabled').select { |option| option.value.present? }.sample
+
+    @filled_country_fields = option.try(:value) if country_code # So Postal Code can be set to a valid one
+
+    option.try(:text) || ''
+  end
+
+  def value_for_input_checkbox_field(field, fill_value)
+    if !fill_value.nil?
+      if truthy?(fill_value)
+        true
+      elsif falsey?(fill_value)
+        false
+      else
+        fill_values = Array(fill_value)  # Allow an array of fill values to be passed
+        (fill_values.include?(field['value']) || fill_values.include?(field.find(:xpath, '..').text))
+      end
+    elsif field['required'].nil? == false
+      true
+    elsif field['value'] == 'true'
+      true
+    elsif field['value'] == 'false'
+      false
+    else
+      [true, false].sample
+    end
+  end
+
+  # The first time we run into a radio button, we definitely want to set it to TRUE so it's definitely selected
+  # Subsequent ones, we can randomly true/false
+  # Then if we run into something that has a fill_value, we definitely want to set that one to TRUE, and false the rest
+  def value_for_input_radio_field(field, fill_value)
+    @filled_radio_fields ||= {}
+
+    previous = @filled_radio_fields[field['name']]
+
+    retval =
+      if previous == true  # We've selected one of the options before
+        [true, false].sample
+      elsif previous.kind_of?(String)  # We selected a previous option with a specific fill_value
+        false
+      else # We've never seen this radio field before
+        true
+      end
+
+    if fill_value.present? && (fill_value == field['value'] || fill_value == field.find(:xpath, '..').text)
+      @filled_radio_fields[field['name']] = fill_value
+      true
+    elsif fill_value.present?
+      nil
+    else
+      @filled_radio_fields[field['name']] ||= true
+      retval
+    end
+  end
+
+  def value_for_input_numeric_field(field, selector)
+    min = (Float(field['min']) rescue 0)
+    max = (Float(field['max']) rescue 1000)
+    number = Random.new.rand(min..max)
+    number = (number.kind_of?(Float) ? number.round(2) : number)
+
+    if (field['step'] == '1' || field['class'].to_s.split(' ').include?('integer'))
+      number = number.to_i
+    end
+
+    return number if field['max'].blank?
+
+    shared_max_fields = all(selector)
+    return number if shared_max_fields.length <= 1
+
+    # So there's definitely 2+ fields that share the same max, named the same
+    # We want the total value of all these fields to add upto the max single max value
+    @filled_numeric_fields ||= {}
+    @filled_numeric_fields[selector] ||= max
+
+    available = @filled_numeric_fields[selector]
+
+    amount = if max.kind_of?(Float)
+      (((max * 1000.0) / shared_max_fields.length.to_f).ceil() / 1000.0).round(2)
+    else
+      (max / shared_max_fields.length.to_f).ceil
+    end
+    amount = [[amount, min].max, available].min
+
+    @filled_numeric_fields[selector] = (available - amount)
+    amount
+  end
+
+  def truthy?(value)
+    if defined?(::ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES)  # Rails 5
+      ::ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(value)
+    else
+      ActiveRecord::Type::Boolean.new.cast(value)
+    end
+  end
+
+  def falsey?(value)
+    if defined?(::ActiveRecord::ConnectionAdapters::Column::FALSE_VALUES)  # Rails 5
+      ::ActiveRecord::ConnectionAdapters::Column::FALSE_VALUES.include?(value)
+    else
+      ::ActiveRecord::Type::Boolean.new.cast(value) == false
+    end
+  end
+
+end

data/test/support/effective_test_bot_form_filler.rb

@@ -1,13 +1,12 @@
+# This is all private stuff. See effective_test_bot_form_helper.rb for public DSL
+
 require 'timeout'
-require 'faker'
 
 module EffectiveTestBotFormFiller
-  DIGITS = ('1'..'9').to_a
-  LETTERS = %w(A B C E G H J K L M N P R S T V X Y) # valid letters of a canadian postal code, eh?
 
   # Fill a boostrap tabs based form
-  def fill_bootstrap_tabs_form(fills = {}, boostrap_tab_elements = nil)
-    tabs = boostrap_tab_elements || all("a[data-toggle='tab']")
+  def fill_bootstrap_tabs_form(fills = {})
+    tabs = all("a[data-toggle='tab']")
 
     # If there's only 1 tab, just fill it out
     (fill_form_fields(fills) and return) unless tabs.length > 1
@@ -49,73 +48,77 @@ module EffectiveTestBotFormFiller
 
   # Only fills in visible fields
   # fill_form(:email => 'somethign@soneone.com', :password => 'blahblah', 'user.last_name' => 'hlwerewr')
-  def fill_form_fields(fills = {})
-
+  def fill_form_fields(fills = {}, debug: false)
     save_test_bot_screenshot
 
-    # Support for the cocoon gem
-    all('a.add_fields[data-association-insertion-template],a.has_many_add').each do |field|
-      next if skip_form_field?(field)
+    seen = {}
 
-      if EffectiveTestBot.tour_mode_extreme?
-        2.times { field.click(); save_test_bot_screenshot }
-      else
-        2.times { field.click() }
-        save_test_bot_screenshot
-      end
-    end
+    5.times do 
+      # Support for the cocoon gem
+      fields = all('a.add_fields[data-association-insertion-template],a.has_many_add').reject { |field| seen[field_key(field)] }
 
-    all('input,select,textarea', visible: false).each do |field|
-      next if skip_form_field?(field)
-      skip_field_screenshot = false
-
-      field_name = [field.tag_name, field['type']].compact.join('_')
-      value = value_for_field(field, fills)
-
-      case field_name
-      when 'input_text', 'input_email', 'input_password', 'input_tel', 'input_number', 'input_url', 'input_color'
-        field.set(value)
-        close_effective_date_time_picker(field) if field['class'].to_s.include?('effective_date')
-      when 'input_checkbox', 'input_radio'
-        begin
-          field.set(value)
-        rescue => e
-          label = first(:label, for: field['id'])
-          label.click if label
-        end
-      when 'textarea', 'textarea_textarea'
-        ckeditor_text_area?(field) ? fill_ckeditor_text_area(field, value) : field.set(value)
-      when 'select', 'select_select-one'
-        if EffectiveTestBot.tour_mode_extreme? && field['class'].to_s.include?('select2') # select2
-          try_script "$('select##{field['id']}').select2('open')"
-          save_test_bot_screenshot
+      fields.each do |field|
+        seen[field_key(field)] = true
+        next if skip_form_field?(field)
+
+        if EffectiveTestBot.tour_mode_extreme?
+          2.times { field.click(); save_test_bot_screenshot }
+        else
+          2.times { field.click() }; save_test_bot_screenshot
         end
+      end
+
+      # Fill all fields now
+      fields = all('input,select,textarea', visible: false).reject { |field| seen[field_key(field)] }
+
+      break unless fields.present?
+
+      fields.each do |field|
+        seen[field_key(field)] = true
+        skip_field_screenshot = false
 
-        if field.all('option:enabled').length > 0 && value != :unselect
-          field.select(value, match: :first, disabled: false)
+        if debug
+          puts "CONSIDERING: #{field_key(field)}"
+          puts " -> SKIPPED" if skip_form_field?(field)
         end
 
-        if EffectiveTestBot.tour_mode_extreme? && field['class'].to_s.include?('select2')
-          try_script "$('select##{field['id']}').select2('close')"
+        next if skip_form_field?(field)
+
+        value = faker_value_for_field(field, fills)
+
+        if debug
+          puts " -> FILLING: #{value}" 
         end
-      when 'input_file'
-        if field['class'].to_s.include?('asset-box-uploader-fileinput')
-          upload_effective_asset(field, value)
+
+        field_name = [field.tag_name, field['type']].compact.join('_')
+
+        case field_name
+        when 'input_text', 'input_email', 'input_password', 'input_tel', 'input_number', 'input_url', 'input_color'
+          if field['class'].to_s.include?('effective_date')
+            fill_input_date(field, value)
+          else
+            fill_input_text(field, value)
+          end
+        when 'input_checkbox'
+          fill_input_checkbox(field, value)
+        when 'input_radio'
+          fill_input_radio(field, value)
+        when 'textarea', 'textarea_textarea'
+          fill_input_text_area(field, value)
+        when 'select', 'select_select-one', 'select_select-multiple'
+          fill_input_select(field, value)
+        when 'input_file'
+          fill_input_file(file, value)
+        when 'input_submit', 'input_search', 'input_button'
+          skip_field_screenshot = true # Do nothing
         else
-          field.set(value)
+          raise "unsupported field type #{field_name}"
         end
-      when 'input_submit', 'input_search', 'input_button'
-        skip_field_screenshot = true
-        # Do nothing
-      else
-        raise "unsupported field type #{field_name}"
+
+        save_test_bot_screenshot if EffectiveTestBot.tour_mode_extreme? && !skip_field_screenshot
       end
 
       wait_for_ajax
-
-      if EffectiveTestBot.tour_mode_extreme?
-        save_test_bot_screenshot unless skip_field_screenshot
-      end
     end
 
     # Clear any value_for_field momoized values
@@ -127,228 +130,69 @@ module EffectiveTestBotFormFiller
     save_test_bot_screenshot
   end
 
-  # Generates an appropriately pseudo-random value for the given field
-  # Pass in a Hash of fills to define pre-selected values
-  #
-  # Operates on just string keys, no symbols here
-
-  def value_for_field(field, fills = {})
-    field_name = [field.tag_name, field['type']].compact.join('_')
-    attributes = field['name'].to_s.gsub(']', '').split('[') # user[something_attributes][last_name] => ['user', 'something_attributes', 'last_name']
-    attribute = attributes.last.to_s
+  def fill_input_text(field, value)
+    field.set(value)
+  end
 
-    fill_value = fill_value_for_field(fills, attributes, field['value'], field_name)
+  def fill_input_date(field, value)
+    field.set(value)
+    try_script "$('input##{field['id']}').data('DateTimePicker').hide()"
+  end
 
-    # If there is a predefined fill value for this field return it now
-    # except for select, checkbox and radio fields which we want to match by value or label
-    if fill_value.present? && !['select', 'input_checkbox', 'input_radio'].include?(field_name)
-      return fill_value
+  def fill_input_checkbox(field, value)
+    return if value.nil?
+    
+    begin
+      field.set(value)
+    rescue => e
+      label = first(:label, for: field['id'])
+      label.click if label
     end
+  end
 
-    case field_name
-    when 'input_text'
-      classes = field['class'].to_s.split(' ')
-
-      if classes.include?('date') # Let's assume this is a date input.
-        if attribute.include?('end') || attribute.include?('expire') # Make sure end dates are after start dates
-          Faker::Date.forward(365).strftime('%Y-%m-%d')
-        else
-          Faker::Date.backward(365).strftime('%Y-%m-%d')
-        end
-      elsif classes.include?('datetime')
-        if attribute.include?('end') || attribute.include?('expire')
-          Faker::Date.forward(365).strftime('%Y-%m-%d %H:%m')
-        else
-          Faker::Date.backward(365).strftime('%Y-%m-%d %H:%m')
-        end
-      elsif classes.include?('numeric')
-        value_for_input_numeric_field(field, "input.numeric[name$='[#{attribute}]']")
-      elsif classes.include?('email') || attribute.include?('email')
-        Faker::Internet.email
-      elsif classes.include?('price') # effective_form_inputs price
-        4.times.map { DIGITS.sample }.join('') + '.00'
-      elsif classes.include?('numeric') || attribute.include?('number')
-        min = (Float(field['min']) rescue 1)
-        max = (Float(field['max']) rescue 1000)
-        number = Random.new.rand(min..max)
-        number.kind_of?(Float) ? number.round(2) : number
-      elsif attribute.include?('first_name')
-        Faker::Name.first_name
-      elsif attribute.include?('last_name')
-        Faker::Name.last_name
-      elsif attribute.include?('website')
-        Faker::Internet.url
-      elsif attribute.include?('city')
-        Faker::Address.city
-      elsif attribute.include?('address2')
-        Faker::Address.secondary_address
-      elsif attribute.include?('address')
-        Faker::Address.street_address
-      elsif attribute.include?('name')
-        Faker::Name.name
-      elsif attribute.include?('postal_code')
-        if @filled_country_fields == 'US'
-          DIGITS.sample + DIGITS.sample + DIGITS.sample + DIGITS.sample + DIGITS.sample
-        else
-          LETTERS.sample + DIGITS.sample + LETTERS.sample + ' ' + DIGITS.sample + LETTERS.sample + DIGITS.sample
-        end
-      elsif attribute.include?('postal') # Make a Canadian postal code
-        LETTERS.sample + DIGITS.sample + LETTERS.sample + ' ' + DIGITS.sample + LETTERS.sample + DIGITS.sample
-      elsif attribute.include?('zip') && attribute.include?('code') # Make a US zip code
-        DIGITS.sample + DIGITS.sample + DIGITS.sample + DIGITS.sample + DIGITS.sample
-      elsif attribute.include?('social_insurance_number') || attributes.include?('sin_number')
-        "#{DIGITS.sample(3).join} #{DIGITS.sample(3).join} #{DIGITS.sample(3).join}"
-      elsif attribute.include?('slug')
-        Faker::Lorem.words(3).join(' ').parameterize
-      else
-        Faker::Lorem.words(3).join(' ').capitalize
-      end
-
-    when 'input_checkbox'
-      value_for_input_checkbox_field(field, fill_value)
-
-    when 'input_color'
-      Faker::Color.hex_color
-
-    when 'input_email'
-      Faker::Internet.email
-
-    when 'input_file'
-      if field['class'].to_s.include?('asset-box-uploader-fileinput')
-        "#{File.dirname(__FILE__).sub('test/support', 'test/fixtures')}/documents._test"
-      else
-        "#{File.dirname(__FILE__).sub('test/support', 'test/fixtures')}/logo.png"
-      end
-
-    when 'input_number'
-      value_for_input_numeric_field(field, "input[type='number'][name$='[#{attribute}]']")
-
-    when 'input_password'
-      # Use the same password throughout a single test. Allows passwords and password_confirmations to match.
-      @filled_password_fields ||= Faker::Internet.password
-
-    when 'input_radio'
-      value_for_input_radio_field(field, fill_value)
-
-    when 'select', 'select_select-one'
-      return fill_value if fill_value == :unselect
-
-      if fill_value.present? # accept a value or text
-        field.all('option:enabled').each do |option|
-          if (option.text == fill_value || option.value.to_s == fill_value)
-            @filled_country_fields = option.value if attribute == 'country_code'
-            return option.text
-          end
-        end
-      end
-
-      option = field.all('option:enabled').select { |option| option.value.present? }.sample
-
-      @filled_country_fields = option.try(:value) if attribute == 'country_code' # So Postal Code can be set to a valid one
-
-      option.try(:text) || ''
-
-    when 'input_tel'
-      d = 10.times.map { DIGITS.sample }
-      d[0] + d[1] + d[2] + '-' + d[3] + d[4] + d[5] + '-' + d[6] + d[7] + d[8] + d[9]
-
-    when 'input_url'
-      Faker::Internet.url
-
-    when 'textarea', 'textarea_textarea'
-      Faker::Lorem.paragraph
-
-    when 'input_submit', 'input_search', 'input_button'
-      nil
+  def fill_input_radio(field, value)
+    return if value.nil?
 
-    else
-      raise "fill_value unsupported field type: #{field_name}"
+    begin
+      field.set(value)
+    rescue => e
+      label = first(:label, for: field['id'])
+      label.click if label
     end
   end
 
-  def value_for_input_checkbox_field(field, fill_value)
-    if !fill_value.nil?
-      if truthy?(fill_value)
-        true
-      elsif falsey?(fill_value)
-        false
-      else
-        fill_values = Array(fill_value)  # Allow an array of fill values to be passed
-        (fill_values.include?(field['value']) || fill_values.include?(field.find(:xpath, '..').text))
-      end
-    elsif field['required'].nil? == false
-      true
-    elsif field['value'] == 'true'
-      true
-    elsif field['value'] == 'false'
-      false
+  def fill_input_text_area(field, value)
+    if ckeditor_text_area?(field)
+      value = "<p>#{value.gsub("'", '')}</p>"
+      try_script "CKEDITOR.instances['#{field['id']}'].setData('#{value}')"
     else
-      [true, false].sample
+      field.set(value)
     end
   end
 
-  # The first time we run into a radio button, we definitely want to set it to TRUE so it's definitely selected
-  # Subsequent ones, we can randomly true/false
-  # Then if we run into something that has a fill_value, we definitely want to set that one to TRUE, and false the rest
-  def value_for_input_radio_field(field, fill_value)
-    @filled_radio_fields ||= {}
-
-    previous = @filled_radio_fields[field['name']]
-
-    retval =
-      if previous == true  # We've selected one of the options before
-        [true, false].sample
-      elsif previous.kind_of?(String)  # We selected a previous option with a specific fill_value
-        false
-      else # We've never seen this radio field before
-        true
-      end
-
-    if fill_value.present? && (fill_value == field['value'] || fill_value == field.find(:xpath, '..').text)
-      @filled_radio_fields[field['name']] = fill_value
-      true
-    else
-      @filled_radio_fields[field['name']] ||= true
-      retval
+  def fill_input_select(field, value)
+    if EffectiveTestBot.tour_mode_extreme? && field['class'].to_s.include?('select2') # select2
+      try_script "$('select##{field['id']}').select2('open')"
+      save_test_bot_screenshot
     end
-  end
-
-  def value_for_input_numeric_field(field, selector)
-    min = (Float(field['min']) rescue 0)
-    max = (Float(field['max']) rescue 1000)
-    number = Random.new.rand(min..max)
-    number = (number.kind_of?(Float) ? number.round(2) : number)
 
-    if (field['step'] == '1' || field['class'].to_s.split(' ').include?('integer'))
-      number = number.to_i
+    if field.all('option:enabled').length > 0 && value != :unselect
+      Array(value).each do |value|
+        field.select(value, match: :first, disabled: false)
+      end
     end
 
-    return number if field['max'].blank?
-
-    shared_max_fields = all(selector)
-    return number if shared_max_fields.length <= 1
-
-    # So there's definitely 2+ fields that share the same max, named the same
-    # We want the total value of all these fields to add upto the max single max value
-    @filled_numeric_fields ||= {}
-    @filled_numeric_fields[selector] ||= max
-
-    available = @filled_numeric_fields[selector]
-
-    amount = if max.kind_of?(Float)
-      (((max * 1000.0) / shared_max_fields.length.to_f).ceil() / 1000.0).round(2)
-    else
-      (max / shared_max_fields.length.to_f).ceil
+    if field['class'].to_s.include?('select2')
+      try_script "$('select##{field['id']}').select2('close')"
     end
-    amount = [[amount, min].max, available].min
-
-    @filled_numeric_fields[selector] = (available - amount)
-    amount
   end
 
-  def fill_ckeditor_text_area(field, value)
-    value = "<p>#{value.gsub("'", '')}</p>"
-    try_script "CKEDITOR.instances['#{field['id']}'].setData('#{value}')"
+  def fill_input_file(field, value)
+    if field['class'].to_s.include?('asset-box-uploader-fileinput')
+      upload_effective_asset(field, value)
+    else
+      field.set(value)
+    end
   end
 
   # The field here is going to be the %input{:type => file}. Files can be one or more pathnames
@@ -403,28 +247,8 @@ module EffectiveTestBotFormFiller
     try_script "$('select##{field['id']}').val('').trigger('change.select2')"
   end
 
-  def close_effective_date_time_picker(field)
-    try_script "$('input##{field['id']}').data('DateTimePicker').hide()"
-  end
-
   private
 
-  def fill_value_for_field(fills, attributes, value, field_name)
-    return if fills.blank? || (attributes.blank? && value.blank?)
-
-    key = nil
-    attributes.reverse_each do |name|  # match last_name, then something_attributes.last_name, then user.something_attributes.last_name
-      key = (key.present? ? "#{name}.#{key}" : name) # builds up the string as we go along
-
-      return :unselect if field_name == 'select' && fills.key?(key) && [nil, ''].include?(fills[key])
-      return fills[key].to_s if fills.key?(key)
-    end
-
-    return fills[value] if fills.key?(value)
-
-    nil
-  end
-
   # Takes a capybara element
   def excluding_fields_with_parent(element, &block)
     @test_bot_excluded_fields_xpath = element.try(:path)
@@ -437,6 +261,10 @@ module EffectiveTestBotFormFiller
     (field['class'].to_s.include?('ckeditor') || all("span[id='cke_#{field['id']}']").present?)
   end
 
+  def custom_control_input?(field) # Bootstrap 4 radios and checks
+    field['class'].to_s.include?('custom-control-input')
+  end
+
   def skip_form_field?(field)
     field.reload # Handle a field changing visibility/disabled state from previous form field manipulations
 
@@ -446,25 +274,20 @@ module EffectiveTestBotFormFiller
     field_id.start_with?('filters_scope_') ||
     field_id.start_with?('filters_') && field['name'].blank? ||
     field.disabled? ||
-    (!field.visible? && !ckeditor_text_area?(field)) ||
+    (!field.visible? && !ckeditor_text_area?(field) && !custom_control_input?(field)) ||
     ['true', true, 1].include?(field['data-test-bot-skip']) ||
     (@test_bot_excluded_fields_xpath.present? && field.path.include?(@test_bot_excluded_fields_xpath))
   end
 
-  def truthy?(value)
-    if defined?(::ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES)  # Rails 5
-      ::ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(value)
-    else
-      ActiveRecord::Type::Boolean.new.cast(value)
-    end
-  end
+  def field_key(field)
+    field_name = [field.tag_name, field['type']].compact.join('_')
 
-  def falsey?(value)
-    if defined?(::ActiveRecord::ConnectionAdapters::Column::FALSE_VALUES)  # Rails 5
-      ::ActiveRecord::ConnectionAdapters::Column::FALSE_VALUES.include?(value)
-    else
-      ::ActiveRecord::Type::Boolean.new.cast(value) == false
-    end
+    [
+      field['name'].presence,
+      ("##{field['id']}" if field['id'].present?), 
+      field_name,
+      (".#{field['class'].split(' ').join('.')}" if field['class'].present?)
+    ].compact.join(' ')
   end
 
 end

data/test/support/effective_test_bot_form_helper.rb

@@ -9,10 +9,11 @@ module EffectiveTestBotFormHelper
     form_fills = HashWithIndifferentAccess.new((EffectiveTestBot.form_fills || {}).merge(fills || {}))
 
     if bootstrap_tabs.length > 1
-      fill_bootstrap_tabs_form(form_fills, bootstrap_tabs)
+      fill_bootstrap_tabs_form(form_fills)
     else
       fill_form_fields(form_fills)
     end
+    
     true
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_test_bot
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-17 00:00:00.000000000 Z
+date: 2019-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -155,6 +155,7 @@ files:
 - test/fixtures/documents._test
 - test/fixtures/logo.png
 - test/support/effective_test_bot_assertions.rb
+- test/support/effective_test_bot_form_faker.rb
 - test/support/effective_test_bot_form_filler.rb
 - test/support/effective_test_bot_form_helper.rb
 - test/support/effective_test_bot_login_helper.rb