effective_test_bot 1.1.34 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbc62ecd64fb4cb7347234c1d202b2cedaa79f65522d08d3b1cc9c4910b41982
-  data.tar.gz: ad97cd5e6a5102265456a761f92b9923ef1556aa2df9fbc0db0de3c00c35d8dd
+  metadata.gz: 647d5dd319259ed9c24df5ffc927e84a8c10e8a5dba646c51a4b986ce4a770a1
+  data.tar.gz: 043afb956e64b693898b2c3d640b6498217f01781cf2fbba34d20e2a02587e80
 SHA512:
-  metadata.gz: 259356daa7725ae3cc06eb278904eac48beca8383fbed43db425de744f7980ec7fc2b51f116889124baa6ea4312a4f4e4fe76fce1fae1367ac93dfa5af733c28
-  data.tar.gz: b8bd1757017c4e95d71d49040dd6f18a29bfc45cdc569f726c52315bc0d82bf75e25678de4b1b0dda47debbe4c8888ef1329bc4cc0594cc42420d89580299122
+  metadata.gz: 31dd6ecaa5eaf1a2ace0a162c994e7bafd3c67eb0997cc924fdaa0bce2c74e79d00337cd5bbff05472ab8f0f76e7c70b30428326c96fef7f48dd5feb810ca05f
+  data.tar.gz: 5fa422b2fe60f3e4c9ad057e77ed6335c41d273b6ddb563db20b674d3f1363a1dfe2a08f4ed59b6256d16a04c601a44cd047677d2479c76bacbbeda1b6f5073f

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.34'.freeze
+  VERSION = '1.2.2'.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:")
@@ -209,35 +210,39 @@ module EffectiveTestBotAssertions
 
   def assert_no_email(&block)
     before = ActionMailer::Base.deliveries.map { |mail| {to: mail.to, subject: mail.subject} }
-    yield
+    retval = yield
     after = ActionMailer::Base.deliveries.map { |mail| {to: mail.to, subject: mail.subject} }
 
     diff = (after - before)
 
     assert diff.blank?, "(assert_no_email) #{diff.length} unexpected emails delivered: #{diff}"
+    retval
   end
 
   # assert_effective_log { click_on('download.txt') }
-  def assert_effective_log(status: nil)
+  def assert_effective_log(status: nil, &block)
     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
+    retval = yield
     after = logs.count
 
     assert (after - before == 1), "(assert_effective_log) Expected one log to have been created"
+    retval
   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, count: nil, &block)
+    retval = nil
+
     if block_given?
       before = ActionMailer::Base.deliveries.length
-      yield
+      retval = yield
       difference = (ActionMailer::Base.deliveries.length - before)
 
       if count.present?
@@ -249,7 +254,7 @@ module EffectiveTestBotAssertions
 
     if (action || to || from || subject || body).nil?
       assert ActionMailer::Base.deliveries.present?, message || "(assert_email) Expected email to have been delivered"
-      return
+      return retval
     end
 
     actions = ActionMailer::Base.instance_variable_get(:@mailer_actions)
@@ -263,7 +268,7 @@ module EffectiveTestBotAssertions
       matches &&= (message.subject == subject) if subject
       matches &&= (message.body == body) if body
 
-      return if matches
+      return retval if matches
     end
 
     expected = [

data/test/support/effective_test_bot_form_filler.rb

@@ -9,7 +9,7 @@ module EffectiveTestBotFormFiller
     tabs = all("a[data-toggle='tab']", wait: false)
 
     # If there's only 1 tab, just fill it out
-    (fill_form_fields(fills) and return) unless tabs.length > 1
+    return fill_form_fields(fills) unless tabs.length > 1
 
     # If there's more than one tab:
     # We first fill in all fields that are outside of the tab-content
@@ -50,9 +50,10 @@ module EffectiveTestBotFormFiller
 
   # Only fills in visible fields
   # fill_form(:email => 'somethign@soneone.com', :password => 'blahblah', 'user.last_name' => 'hlwerewr')
-  def fill_form_fields(fills = {}, debug: false)
+  def fill_form_fields(fills = {})
     save_test_bot_screenshot
 
+    debug = fills.delete(:debug)
     seen = {}
 
     5.times do

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

@@ -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.34
+  version: 1.2.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-04 00:00:00.000000000 Z
+date: 2021-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails