effective_test_bot 1.1.36 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b48d94a0636a8e399c6d2d70e26f5cc49e2071e34b8a81be179dc3334c52c9b
-  data.tar.gz: 4dbfa94a3c171506de7dcd51af8b7999573ab3017ef3984ffdf53e9530f731a0
+  metadata.gz: e4b11fd2fb320e9749fb22973e5a83b3b66d40c4bc250f41c8e753f351b9ebf8
+  data.tar.gz: d9f59e7a13b07a2c0584009ad587dd018ab3a1f44e7515e74ae62e2a80b4087e
 SHA512:
-  metadata.gz: fd447674df972509839eefcefa0cd04b9d10e058fe236dceabf6dc340f8df9ed50fe439177d15b8367b1966071c66c7ac60237bbd15ae1a58a19a29bd961c9e6
-  data.tar.gz: 2446921073f5b4b4be0f893f026cdc9526070f951cf4005fc145bf9c5ce3f7910a03f98efd98b3a4672887e7087db16373100693b271fa3c07f9faf5230bb0af
+  metadata.gz: ae3c9fe2c536236be682607375c9767e8cb752764d24cc766a0d56f53b08dade662bbe6fb4ffc45622fcf4ec6fdded9434135306cbb2d8b208b1e1aa8f69fb1a
+  data.tar.gz: ffef5bfd26a4708d87b328ebd9a9f5056c455a5380402c7825aa8f979bc8a1562a1ddfde1bcd1078fcc3a1615e0c2678a6e24c232f3a8335e2916f3d9fb7ec84

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.36'.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:")

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

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