effective_test_bot 1.1.31 → 1.1.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a03f1fb6d9966112b23b0258b97b01170f21b814306e326a8e090addb7ff64cd
-  data.tar.gz: 228fe00102bf6f801aac88425f6588faec7777243881c83723f23ff9ea6b3625
+  metadata.gz: 8b48d94a0636a8e399c6d2d70e26f5cc49e2071e34b8a81be179dc3334c52c9b
+  data.tar.gz: 4dbfa94a3c171506de7dcd51af8b7999573ab3017ef3984ffdf53e9530f731a0
 SHA512:
-  metadata.gz: bd26c1a23b70d3c5285df2d0925c1eb10651f696d338f9a0e1c68244392920c2ab6514f9718266503fdc2a30832356052e39336f73571cbdbd12028317151f98
-  data.tar.gz: d139f4e47695a057a318384d572a7eeda6e27816debc92b18c07c8a94399c0427e983cba19c863e3947f78af9a1bb97d1a2758019d3589a7c2ed90cab5d5e244
+  metadata.gz: fd447674df972509839eefcefa0cd04b9d10e058fe236dceabf6dc340f8df9ed50fe439177d15b8367b1966071c66c7ac60237bbd15ae1a58a19a29bd961c9e6
+  data.tar.gz: 2446921073f5b4b4be0f893f026cdc9526070f951cf4005fc145bf9c5ce3f7910a03f98efd98b3a4672887e7087db16373100693b271fa3c07f9faf5230bb0af

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.31'.freeze
+  VERSION = '1.1.36'.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_login_helper.rb

@@ -10,8 +10,8 @@ module EffectiveTestBotLoginHelper
   # This is currently hardcoded to use the warden login_as test helper
   def sign_in(user)
     if user.kind_of?(String)
-      login_as(User.find_by_email!(user))
-    elsif user.kind_of?(User)
+      login_as(devise_user_class.find_by_email!(user))
+    elsif user.kind_of?(devise_user_class)
       raise 'user must be persisted' unless user.persisted?
       user.reload
       login_as(user)
@@ -28,7 +28,7 @@ module EffectiveTestBotLoginHelper
   end
 
   def sign_in_manually(user_or_email, password = nil)
-    visit new_user_session_path
+    visit (respond_to?(:new_user_session_path) ? new_user_session_path : '/users/sign_in')
 
     email = (user_or_email.respond_to?(:email) ? user_or_email.email : user_or_email)
     username = (user_or_email.respond_to?(:username) ? user_or_email.username : user_or_email)
@@ -41,18 +41,23 @@ module EffectiveTestBotLoginHelper
   end
 
   def sign_up(email: Faker::Internet.email, password: Faker::Internet.password, **options)
-    visit new_user_registration_path
+    visit (respond_to?(:new_user_registration_path) ? new_user_registration_path : '/users/sign_up')
 
     within('form#new_user') do
       fill_form({email: email, password: password, password_confirmation: password}.merge(options))
       submit_novalidate_form
     end
 
-    User.find_by_email(email)
+    devise_user_class.find_by_email(email)
   end
 
   def current_user
-    User.where(id: assigns['current_user']['id']).first if (assigns['current_user'] && assigns['current_user']['id'])
+    return nil unless (assigns['current_user'] && assigns['current_user']['id'])
+    devise_user_class.where(id: assigns['current_user']['id']).first
+  end
+
+  def devise_user_class
+    User
   end
 
 end

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.31
+  version: 1.1.36
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-13 00:00:00.000000000 Z
+date: 2021-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails