effective_test_bot 0.6.12 → 0.6.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92979123ee096f434866473b770ed3a36cae7a30
-  data.tar.gz: fd9c52fc6709ab4bc59b4c4a1df576cf485298c8
+  metadata.gz: ab19f5103e6d6a08812c3a1fe04f64e679576ff5
+  data.tar.gz: 814dd84b78ee40413853d9188c9b0f7d8455c85f
 SHA512:
-  metadata.gz: 08520b2a3e9925b444f75716bd702c3d89fafb2eae2e309ecd3b383ba6720a78093bcf2e4474e0af1ab18cfe726fb9b715c915faf022901db21a9a9ac7b80969
-  data.tar.gz: 87afbb19fd69f48e9844757eb97cfff049f0cc5b8b0b710f1d31df4ecfd07038bcd931d23a92340d5b4feca0a09cd9dc2d0985846622f6d09353c9657b70ef09
+  metadata.gz: 7cd823aa344c7c77d33b51b809a342472a7b2ecc9e2359aa64a0e9db3c0fd96a2504a27f1b59ee5426abec0214690fcd12e37ae1ad4cf0683bf6d2a298b1fbf1
+  data.tar.gz: 4efb3e6bd1a5b92684096bb87cc183cc2c1f25623eef4d40fd247241144d475a190d85dca9e28683b9e4b4fb47a6d5a24d8a1eee49ec2450b89b797dae2fa2d1

data/app/helpers/effective_test_bot_mailer_helper.rb

@@ -2,7 +2,7 @@ module EffectiveTestBotMailerHelper
   # This is included to ActionMailer::Base an after_filter
   # And allows the assert_email assertion to work
   def assign_test_bot_mailer_info
-    message.instance_variable_set(:@mailer_class, self.class)
-    message.instance_variable_set(:@mailer_action, action_name)
+    actions = ActionMailer::Base.instance_variable_get(:@mailer_actions)
+    ActionMailer::Base.instance_variable_set(:@mailer_actions, Array(actions) + [action_name])
   end
 end

data/lib/effective_test_bot/version.rb

@@ -1,3 +1,3 @@
 module EffectiveTestBot
-  VERSION = '0.6.12'.freeze
+  VERSION = '0.6.13'.freeze
 end

data/test/support/effective_test_bot_assertions.rb

@@ -93,6 +93,16 @@ module EffectiveTestBotAssertions
     assert (active.blank? || active.zero?), message.sub(':count:', active.to_s)
   end
 
+  def assert_no_active_jobs(message = "(no_active_jobs) :count: Unexpected ActiveJob jobs present")
+    jobs = if defined?(SuckerPunch)
+      SuckerPunch::Queue.all.length
+    else
+      ActiveJob::Base.queue_adapter.enqueued_jobs.count
+    end
+
+    assert (jobs == 0), message.sub(':count:', jobs.to_s)
+  end
+
   def assert_no_js_errors(message = nil)
     errors = page.driver.error_messages
     assert errors.blank?, message || "(no_js_errors) Unexpected javascript error:\n#{errors.first.to_s}"
@@ -184,16 +194,17 @@ module EffectiveTestBotAssertions
   # 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)
-
     if (action || to || from || subject || body).nil?
       assert ActionMailer::Base.deliveries.present?, message || "(assert_email) Expected email to have been delivered"
       return
     end
 
+    actions = ActionMailer::Base.instance_variable_get(:@mailer_actions)
+
     ActionMailer::Base.deliveries.each do |message|
       matches = true
 
-      matches &&= (message.instance_variable_get(:@mailer_action) == action.to_s) if action
+      matches &&= (actions.include?(action.to_s)) if action
       matches &&= (Array(message.to).include?(to)) if to
       matches &&= (Array(message.from).include?(from)) if from
       matches &&= (message.subject == subject) if subject

data/test/support/effective_test_bot_form_helper.rb

@@ -64,14 +64,7 @@ module EffectiveTestBotFormHelper
   # Instead we manually trigger submit buttons and use the data-disable-with to
   # make the 'submit form' step look nice
   def click_submit(label, last: false, debug: false)
-    if label.present?
-      submit = find(:link_or_button, label, match: :first)
-      assert submit.present?, "TestBotError: Unable to find a visible submit link or button on #{page.current_path} with the label #{label}"
-    else
-      submit = find("input[type='submit'],button[type='submit']", match: :first)
-      submit = all("input[type='submit'],button[type='submit']").last if last
-      assert submit.present?, "TestBotError: Unable to find a visible input[type='submit'] or button[type='submit'] on #{page.current_path}"
-    end
+    submit = find_submit(label, last: last)
 
     if EffectiveTestBot.screenshots?
       page.execute_script "$('input[data-disable-with]').each(function(i) { $.rails.disableFormElement($(this)); });"
@@ -80,7 +73,7 @@ module EffectiveTestBotFormHelper
     end
 
     if debug
-      puts "Clicking: <#{submit.tag_name} id='#{submit['id']}' class='#{submit['class']}' name='#{submit['name']}' value='#{submit['value']}' />"
+      puts "Clicking: <#{submit.tag_name} id='#{submit['id']}' class='#{submit['class']}' name='#{submit['name']}' value='#{submit['value']}' href='#{submit['href']}' />"
     end
 
     submit.click
@@ -91,6 +84,29 @@ module EffectiveTestBotFormHelper
     true
   end
 
+  # Keys are :value, should be one of :count, :minimum, :maximum, :between, :text, :id, :class, :visible, :exact, :exact_text, :match, :wait, :filter_se
+  def find_submit(label, last: false)
+    submit = nil
+
+    if label.present?
+      submit = (find("input[type='submit'][value='#{label}'],button[type='submit'][value='#{label}']", match: :first) rescue nil)
+      submit ||= find(:link_or_button, label, match: :first)
+
+      if last
+        submit = all("input[type='submit'][value='#{label}'],button[type='submit'][value='#{label}']").last
+        submit ||= all('a', text: label).last
+      end
+
+      assert submit.present?, "TestBotError: Unable to find a visible submit link or button on #{page.current_path} with the label #{label}"
+    else
+      submit = find("input[type='submit'],button[type='submit']", match: :first)
+      submit = all("input[type='submit'],button[type='submit']").last if last
+      assert submit.present?, "TestBotError: Unable to find a visible input[type='submit'] or button[type='submit'] on #{page.current_path}"
+    end
+
+    submit
+  end
+
   def with_raised_unpermitted_params_exceptions(&block)
     action = nil
 

data/test/support/effective_test_bot_test_helper.rb

@@ -16,6 +16,20 @@ module EffectiveTestBotTestHelper
     end
   end
 
+  def wait_for_active_job
+    begin
+      Timeout.timeout(Capybara.default_max_wait_time * 2) do
+        if defined?(SuckerPunch)
+          loop until SuckerPunch::Queue.all.length == 0
+        else
+          loop until ActiveJob::Base.queue_adapter.enqueued_jobs.count == 0
+        end
+      end
+    rescue => e
+      assert_no_active_jobs
+    end
+  end
+
   def finished_all_ajax_requests?
     ajax_request_count = page.evaluate_script('jQuery.active')
     ajax_request_count.blank? || ajax_request_count.zero?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_test_bot
 version: !ruby/object:Gem::Version
-  version: 0.6.12
+  version: 0.6.13
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-10 00:00:00.000000000 Z
+date: 2017-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails