effective_test_bot 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfb43e3e70877589f36e4686127e142207377f2f1232bc000dac2749c4d2e5bc
-  data.tar.gz: 48b700956d1bddf075d49abc9c9f4a4d9f32921d0e2bf4268c578518652f6f72
+  metadata.gz: fd91036d4b959a1a59934248064b1c42b6bb6e9cf8558b6809b9621fc67aed76
+  data.tar.gz: e5bba54a9961847859d1e02963442d4065e75308336a97609eeb351ac9ab671c
 SHA512:
-  metadata.gz: 32190b5326ad994c3c2f8ab3eb186bdd47be93fe164649d349e764a2eec54653e4ad38b67d3a0025c6a82325e8a0f89f86093ae1ef8c5fde7fc2fd5544e791b0
-  data.tar.gz: e2e0c8e3e6c71d969d0cddfb6f925ab2747a803051745172d7e407b8b06231df2b5c14a1ed15b5c69dc32ad255de8885f72bbfe389c1382852659cbb61180d69
+  metadata.gz: 574c821e54abc360af9b1f4f11990b8db8f06685a5c25f096621e8933e34a77829134ae9e06eb5836b171d9ba90a34289e7718566986cdd254af7097b0a1f628
+  data.tar.gz: 6b3f2fd19df1a688cb2fb1bcfa79a2f7c3baf0a5832fdf80796cc1c7cec842314eb99ad03a64d922ce22f8a5d56795ff8f235d27d05675aa7b7988c9e811573d

data/lib/effective_test_bot/version.rb

@@ -1,3 +1,3 @@
 module EffectiveTestBot
-  VERSION = '1.2.4'.freeze
+  VERSION = '1.2.5'.freeze
 end

data/test/support/effective_test_bot_assertions.rb

@@ -1,5 +1,4 @@
 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)
@@ -236,17 +235,19 @@ module EffectiveTestBotAssertions
     retval
   end
 
+  #include ActiveJob::TestHelper if defined?(ActiveJob::TestHelper)
+
   # 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)
+  def assert_email(action = nil, perform: 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
+      perform_enqueued_jobs if perform && respond_to?(:perform_enqueued_jobs)
       retval = yield
+
       difference = (ActionMailer::Base.deliveries.length - before)
 
       if count.present?
@@ -254,6 +255,8 @@ module EffectiveTestBotAssertions
       else
         assert (difference > 0), "(assert_email) Expected at least one email to have been delivered"
       end
+    else
+      perform_enqueued_jobs if perform && respond_to?(:perform_enqueued_jobs)
     end
 
     if (action || to || from || subject || body).nil?

data/test/support/effective_test_bot_test_helper.rb

@@ -110,7 +110,7 @@ module EffectiveTestBotTestHelper
   end
 
   def current_user_assigns_class
-    current_user_assigns_key.sub('current_').gsub('_', '::').classify.safe_constantize
+    current_user_assigns_key.sub('current_', '').gsub('_', '::').classify.safe_constantize
   end
 
   def access_denied_exception

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_test_bot
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-24 00:00:00.000000000 Z
+date: 2021-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails