effective_test_bot 1.1.35 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc72acbdf713f34184e3b5ad7f5667632d0f6328a106de14042c74cf5f4905f6
-  data.tar.gz: 436bf4dee3250bb087ba2cb9119d48e7a4853078f0509cd9558feedb37114083
+  metadata.gz: 80ce8222bd314d35d85d3c6fd58620dbd5d8957cd4ece629467968ee3cbb7e5e
+  data.tar.gz: 322fcb891096428196ce8ce3c51a7692bfae9255c72db164b77aa137d39f31cc
 SHA512:
-  metadata.gz: 4fb77d02cfa0da8f3b940fa697d7dcfa935f7a3c08003108a850a83d4073290e242bba9f448962f31bf27193879350a0f3e35c69e61c26b50193f4e751b68c96
-  data.tar.gz: 3778d54b3764389c71b9438b327218b56e55d9220b431062b8d1816d7c470e0d16a9215e92e7549c05cb45f76824c249329fa8d6d4434d2184d74652fe527ff3
+  metadata.gz: 486cf835958bdaae57dcb381ee604d05daecddde263189b090db4986c3a12fbe388c0f3d94a204fa8a211d8ff488694c816482e056ef1680657d56034f63b9c7
+  data.tar.gz: d66b36d8ede631896e0228970175bfc67f0b6e911f51613b39fb2dbfde56eafab957cc103b54086003f828a9364e7bd9d718b0c1fc3bc7fd3c22e0fd12080ceb

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.35'.freeze
+  VERSION = '1.2.3'.freeze
 end

data/test/support/effective_test_bot_assertions.rb

@@ -1,4 +1,6 @@
 module EffectiveTestBotAssertions
+  include ActiveJob::TestHelper if defined?(ActiveJob::TestHelper)
+
   def assert_page_content(content, message: "(page_content) Expected page content :content: to be present")
     assert page.has_text?(/#{Regexp.escape(content)}/i, wait: 0), message.sub(':content:', content)
   end
@@ -10,13 +12,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 +212,41 @@ 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
+
+    perform_enqueued_jobs if respond_to?(:perform_enqueued_jobs)
+
     if block_given?
       before = ActionMailer::Base.deliveries.length
-      yield
+      retval = yield
       difference = (ActionMailer::Base.deliveries.length - before)
 
       if count.present?
@@ -249,7 +258,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 +272,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

@@ -68,6 +68,11 @@ module EffectiveTestBotTestHelper
     Array(all(selector).first).each { |field| within(field) { yield } }
   end
 
+  def within_tab(name, &block)
+    first("a.nav-link#tab-#{name.parameterize}").click
+    within_first("div.tab-pane##{name.parameterize}") { yield }
+  end
+
   def click_first(label)
     click_link(label, match: :first)
   end
@@ -93,6 +98,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.35
+  version: 1.2.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-04 00:00:00.000000000 Z
+date: 2021-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails