effective_test_bot 1.1.36 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b48d94a0636a8e399c6d2d70e26f5cc49e2071e34b8a81be179dc3334c52c9b
-  data.tar.gz: 4dbfa94a3c171506de7dcd51af8b7999573ab3017ef3984ffdf53e9530f731a0
+  metadata.gz: dfb43e3e70877589f36e4686127e142207377f2f1232bc000dac2749c4d2e5bc
+  data.tar.gz: 48b700956d1bddf075d49abc9c9f4a4d9f32921d0e2bf4268c578518652f6f72
 SHA512:
-  metadata.gz: fd447674df972509839eefcefa0cd04b9d10e058fe236dceabf6dc340f8df9ed50fe439177d15b8367b1966071c66c7ac60237bbd15ae1a58a19a29bd961c9e6
-  data.tar.gz: 2446921073f5b4b4be0f893f026cdc9526070f951cf4005fc145bf9c5ce3f7910a03f98efd98b3a4672887e7087db16373100693b271fa3c07f9faf5230bb0af
+  metadata.gz: 32190b5326ad994c3c2f8ab3eb186bdd47be93fe164649d349e764a2eec54653e4ad38b67d3a0025c6a82325e8a0f89f86093ae1ef8c5fde7fc2fd5544e791b0
+  data.tar.gz: e2e0c8e3e6c71d969d0cddfb6f925ab2747a803051745172d7e407b8b06231df2b5c14a1ed15b5c69dc32ad255de8885f72bbfe389c1382852659cbb61180d69

data/lib/effective_test_bot.rb

@@ -3,28 +3,26 @@ require 'effective_test_bot/engine'
 require 'effective_test_bot/dsl'
 require 'effective_test_bot/middleware'
 require 'effective_test_bot/version'
+require 'timecop'
 
 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.36'.freeze
+  VERSION = '1.2.4'.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

@@ -11,10 +11,12 @@ module EffectiveTestBotLoginHelper
   def sign_in(user)
     if user.kind_of?(String)
       login_as(devise_user_class.find_by_email!(user))
-    elsif user.kind_of?(devise_user_class)
+    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
@@ -34,7 +36,7 @@ module EffectiveTestBotLoginHelper
     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
@@ -43,7 +45,7 @@ module EffectiveTestBotLoginHelper
   def sign_up(email: Faker::Internet.email, password: Faker::Internet.password, **options)
     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
@@ -52,12 +54,14 @@ module EffectiveTestBotLoginHelper
   end
 
   def current_user
-    return nil unless (assigns['current_user'] && assigns['current_user']['id'])
-    devise_user_class.where(id: assigns['current_user']['id']).first
+    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
-    User
+    (current_user_assigns_class || User)
   end
 
 end

data/test/support/effective_test_bot_test_helper.rb

@@ -68,6 +68,18 @@ 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 with_time_travel(date, &block)
+    Timecop.travel(date)
+    retval = yield
+    Timecop.return
+    retval
+  end
+
   def click_first(label)
     click_link(label, match: :first)
   end
@@ -93,6 +105,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.36
+  version: 1.2.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-16 00:00:00.000000000 Z
+date: 2021-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A shared library of rails model & system tests that should pass in every
   Rails application.
 email: