effective_test_bot 1.1.32 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48c18bd23b31a9fbc1ea45a86275fffe86d1ed4178d6b639fab958de45092b0a
-  data.tar.gz: 184a735e80bfa2e483236fae17f04d62be01e3e5ca0303eb7c5effcce59b0245
+  metadata.gz: e4b11fd2fb320e9749fb22973e5a83b3b66d40c4bc250f41c8e753f351b9ebf8
+  data.tar.gz: d9f59e7a13b07a2c0584009ad587dd018ab3a1f44e7515e74ae62e2a80b4087e
 SHA512:
-  metadata.gz: a28cb45fb1f5b3be46bb380aba5ade362d0376d8495a0b10467cac6a0cb728c27f68a0066cd45df94b3757f630be3853f71da7c7c6497094f23c2c385af0104f
-  data.tar.gz: b7bc9f3512a1fcadcc7170b5a08b2bae79fe948091bffe84f03991f60dbf1321d615b30f3759d344c94e8184482a17104722ad555be5b751ae7d7352121c8e73
+  metadata.gz: ae3c9fe2c536236be682607375c9767e8cb752764d24cc766a0d56f53b08dade662bbe6fb4ffc45622fcf4ec6fdded9434135306cbb2d8b208b1e1aa8f69fb1a
+  data.tar.gz: ffef5bfd26a4708d87b328ebd9a9f5056c455a5380402c7825aa8f979bc8a1562a1ddfde1bcd1078fcc3a1615e0c2678a6e24c232f3a8335e2916f3d9fb7ec84

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.rb

@@ -5,26 +5,23 @@ require 'effective_test_bot/middleware'
 require 'effective_test_bot/version'
 
 module EffectiveTestBot
-  mattr_accessor :user
-  mattr_accessor :except
-  mattr_accessor :only
-  mattr_accessor :fail_fast
-  mattr_accessor :form_fills
-  mattr_accessor :screenshots
-  mattr_accessor :autosave_animated_gif_on_failure
-  mattr_accessor :tour_mode
-  mattr_accessor :tour_mode_extreme
-  mattr_accessor :animated_gif_delay
-  mattr_accessor :animated_gif_background_color
-  mattr_accessor :image_processing_class_name
-  mattr_accessor :backtrace_lines
-  mattr_accessor :silence_skipped_routes
-
-  mattr_accessor :passed_tests # This isn't a config variable.
-
-  def self.setup
-    yield self
-  end
+  mattr_accessor :passed_tests
+
+  def self.config_keys
+    [
+      :user,
+      :except, :only,
+      :fail_fast,
+      :form_fills,
+      :screenshots, :autosave_animated_gif_on_failure,
+      :tour_mode, :tour_mode_extreme,
+      :animated_gif_delay, :animated_gif_background_color,
+      :image_processing_class_name,
+      :backtrace_lines, :silence_skipped_routes
+    ]
+  end
+
+  include EffectiveGem
 
   # Test could be something like "crud_test", "crud_test (documents#new)", "documents", documents#new"
   # Assertion will be page_title, or flash

data/lib/effective_test_bot/version.rb

@@ -1,3 +1,3 @@
 module EffectiveTestBot
-  VERSION = '1.1.32'.freeze
+  VERSION = '1.2.0'.freeze
 end

data/test/support/effective_test_bot_assertions.rb

@@ -10,13 +10,14 @@ module EffectiveTestBotAssertions
   def assert_signed_in(message: 'Expected @current_user to be present when signed in')
     visit(root_path)
     assert_page_normal
-    assert assigns['current_user'].present?, message
+
+    assert assigns[current_user_assigns_key].present?, message
   end
 
   def assert_signed_out(message: 'Expected @current_user to be blank when signed out')
     visit(root_path)
     assert_page_normal
-    assert assigns['current_user'].blank?, message
+    assert assigns[current_user_assigns_key].blank?, message
   end
 
   def assert_no_exceptions(message: "(no_exceptions) Unexpected rails server exception:\n:exception:")
@@ -217,16 +218,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,11 +10,13 @@ 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.class.name.end_with?('User')
       raise 'user must be persisted' unless user.persisted?
       user.reload
-      login_as(user)
+
+      devise_scope = user.class.name.underscore.gsub('/', '_').to_sym
+      login_as(user, scope: devise_scope)
     elsif user == false
       true # Do nothing
     else
@@ -28,31 +30,38 @@ 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)
     login = (user_or_email.respond_to?(:login) ? user_or_email.login : user_or_email)
 
-    within('form#new_user') do
+    within('form[id^=new][id$=user]') do
       fill_form(email: email, password: password, username: username, login: login)
       submit_novalidate_form
     end
   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
+    within('form[id^=new][id$=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'])
+    user_id = assigns.dig(current_user_assigns_key, 'id')
+    return if user_id.blank?
+
+    devise_user_class.where(id: user_id).first
+  end
+
+  def devise_user_class
+    (current_user_assigns_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)
@@ -93,6 +93,14 @@ module EffectiveTestBotTestHelper
     key ? assigns[key.to_s] : assigns
   end
 
+  def current_user_assigns_key
+    assigns.keys.find { |key| key.start_with?('current_') && key.end_with?('_user') } || 'current_user'
+  end
+
+  def current_user_assigns_class
+    current_user_assigns_key.sub('current_').gsub('_', '::').classify.safe_constantize
+  end
+
   def access_denied_exception
     return nil unless (page.evaluate_script('window.effective_test_bot.access_denied') rescue nil).present?
 

metadata

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