effective_test_bot 1.1.30 → 1.1.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dec06ddd30a8548521d86039448de854f1ba937f40799d0289e161b4e894131
-  data.tar.gz: bd45ec5a42567d3e11ee9aecdd3cc9359c8351c8f4c8ed21e844f9baeb3d05da
+  metadata.gz: fc72acbdf713f34184e3b5ad7f5667632d0f6328a106de14042c74cf5f4905f6
+  data.tar.gz: 436bf4dee3250bb087ba2cb9119d48e7a4853078f0509cd9558feedb37114083
 SHA512:
-  metadata.gz: d61ff64d42c6d0f95ce15ffb457307286e13ec36347b09c0c208241fb05ed3ca779140b44ad0af49143299f1135c48177a2137d442d5ffb815864359f642a13d
-  data.tar.gz: 3c86a02228efb83687c2b26d7daa878304616361d6ae123bc455b2329ffbc6fb6b53273fd19b1cea05b239d5c46c47ad2af9cfb39407bff1bdf74b3fb5de69e5
+  metadata.gz: 4fb77d02cfa0da8f3b940fa697d7dcfa935f7a3c08003108a850a83d4073290e242bba9f448962f31bf27193879350a0f3e35c69e61c26b50193f4e751b68c96
+  data.tar.gz: 3778d54b3764389c71b9438b327218b56e55d9220b431062b8d1816d7c470e0d16a9215e92e7549c05cb45f76824c249329fa8d6d4434d2184d74652fe527ff3

data/app/helpers/effective_test_bot_controller_helper.rb

@@ -58,10 +58,10 @@ module EffectiveTestBotControllerHelper
       case object
       when ActiveRecord::Base
         assigns[key] = object.attributes
-        assigns[key][:errors] = object.errors.messages.delete_if { |_, v| v.blank? } if object.errors.present?
+        assigns[key][:errors] = object.errors.messages.select { |_, v| v.present? } if object.errors.present?
       when (ActiveModel::Model rescue nil)
         assigns[key] = object.respond_to?(:attributes) ? object.attributes : { present_but_not_serialized: true }
-        assigns[key][:errors] = object.errors.messages.delete_if { |_, v| v.blank? } if object.errors.present?
+        assigns[key][:errors] = object.errors.messages.select { |_, v| v.present? } if object.errors.present?
       when TrueClass, FalseClass, NilClass, String, Symbol, Numeric
         assigns[key] = object
       else

data/lib/effective_test_bot/version.rb

@@ -1,3 +1,3 @@
 module EffectiveTestBot
-  VERSION = '1.1.30'.freeze
+  VERSION = '1.1.35'.freeze
 end

data/test/support/effective_test_bot_assertions.rb

@@ -217,16 +217,34 @@ module EffectiveTestBotAssertions
     assert diff.blank?, "(assert_no_email) #{diff.length} unexpected emails delivered: #{diff}"
   end
 
+  # assert_effective_log { click_on('download.txt') }
+  def assert_effective_log(status: nil)
+    raise('EffectiveLogging is not defined') unless defined?(EffectiveLogging)
+    raise('expected a block') unless block_given?
+
+    logs = (status.present? ? Effective::Log.where(status: status).all : Effective::Log.all)
+
+    before = logs.count
+    yield
+    after = logs.count
+
+    assert (after - before == 1), "(assert_effective_log) Expected one log to have been created"
+  end
+
   # assert_email :new_user_sign_up
   # assert_email :new_user_sign_up, to: 'newuser@example.com'
   # assert_email from: 'admin@example.com'
-  def assert_email(action = nil, to: nil, from: nil, subject: nil, body: nil, message: nil, &block)
+  def assert_email(action = nil, to: nil, from: nil, subject: nil, body: nil, message: nil, count: nil, &block)
     if block_given?
       before = ActionMailer::Base.deliveries.length
       yield
-      after = ActionMailer::Base.deliveries.length
+      difference = (ActionMailer::Base.deliveries.length - before)
 
-      assert (after - before == 1), "(assert_email) Expected one email to have been delivered"
+      if count.present?
+        assert (difference == count), "(assert_email) Expected #{count} email to have been delivered, but #{difference} were instead"
+      else
+        assert (difference > 0), "(assert_email) Expected at least one email to have been delivered"
+      end
     end
 
     if (action || to || from || subject || body).nil?

data/test/support/effective_test_bot_form_filler.rb

@@ -37,7 +37,7 @@ module EffectiveTestBotFormFiller
       save_test_bot_screenshot
 
       tab_href = '#' + tab['href'].to_s.split('#').last
-      within('div' + tab_href) { fill_form_fields(fills) }
+      within_if('div' + tab_href) { fill_form_fields(fills) }
     end
 
     # If there is no visible submits, go back to the first tab
@@ -193,8 +193,23 @@ module EffectiveTestBotFormFiller
       save_test_bot_screenshot
     end
 
-    if field.all('option:enabled', wait: false).length > 0 && value != :unselect
-      Array(value).each do |value|
+    if value == :unselect
+      return close_effective_select(field)
+    end
+
+    if field.all('option:enabled', wait: false).length == 0
+      return close_effective_select(field)
+    end
+
+    # Must be some options
+    Array(value).each do |value|
+      option = field.all("option:enabled[value=\"#{value}\"]", wait: false).first
+      option ||= field.all('option:enabled', wait: false).find { |field| field.text == value }
+
+      if option.present?
+        option.select_option
+      else
+        # This will most likely raise an error that it cant be found
         field.select(value.to_s, match: :first, disabled: false)
       end
     end

data/test/support/effective_test_bot_form_helper.rb

@@ -106,7 +106,7 @@ module EffectiveTestBotFormHelper
   # This kind of sucks, as we want to simulate mouse movements with the tour
   # Instead we manually trigger submit buttons and use the data-disable-with to
   # make the 'submit form' step look nice
-  def click_submit(label = nil, last: false, debug: false)
+  def click_submit(label = nil, last: false, synchronize: true, debug: false)
     submit = find_submit(label, last: last)
 
     if EffectiveTestBot.screenshots?
@@ -128,7 +128,7 @@ module EffectiveTestBotFormHelper
       submit.click
     end
 
-    synchronize!
+    synchronize ? synchronize! : sleep(2)
 
     save_test_bot_screenshot if EffectiveTestBot.screenshots? && page.current_path.present?
 

data/test/support/effective_test_bot_test_helper.rb

@@ -57,7 +57,7 @@ module EffectiveTestBotTestHelper
 
   # Calls capybara within do .. end if selector is present and bool is true
   def within_if(selector, bool = true, &block)
-    (selector.present? && bool) ? within(first(selector)) { yield } : yield
+    (all(selector).length > 0 && bool) ? within(first(selector)) { yield } : yield
   end
 
   def within_each(selector, &block)
@@ -73,7 +73,8 @@ module EffectiveTestBotTestHelper
   end
 
   def effective_bootstrap_custom_data_confirm?
-    (page.evaluate_script('$.rails.effective_bootstrap_custom_data_confirm') rescue nil) == true
+    (page.evaluate_script('$.rails.effective_bootstrap_custom_data_confirm') rescue nil) ||
+    (page.evaluate_script('window.Rails.effective_bootstrap_custom_data_confirm') rescue nil)
   end
 
   # EffectiveTestBot includes an after_filter on ApplicationController to set an http header

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_test_bot
 version: !ruby/object:Gem::Version
-  version: 1.1.30
+  version: 1.1.35
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-11 00:00:00.000000000 Z
+date: 2021-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails