effective_test_bot 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71be7587c07b84fa1b7e452dc469eeb560a1ce47
-  data.tar.gz: 063be9eb1dfc317f6dc01d0a8c199d411953c5f4
+  metadata.gz: 6ab5a8dbd613806a632a7d26883287d92b076ad0
+  data.tar.gz: 282a10e85908184563c4b2b344ee2fc007dbf41a
 SHA512:
-  metadata.gz: 1318c1e88b31a9d2bba44d2262862206c765c6864e8b9bf5d4b6456f90ae7d5fa552960974d4cdbbf83994c42aa1517cb6ffb31d1e6d86ad8960e0f4e38988d4
-  data.tar.gz: 80f617274e4f72d8885926c84fcdf8f19e51d576dcceb3b8914ee9e26a2c54dd32365f8641e04ab7c344f7ba218e25c4375f9a42fdb78f08002c7913a8ee68ae
+  metadata.gz: 13b966c0c1b0b1222f1d44df755a029a4217781b4eacfa57334882bc9d3ab51b021b8e2b572a9087be3612549fdcda9c3c3c6801a39fd869ef4e97e68d6ab2a3
+  data.tar.gz: 92e89261d74ec87d44177c121c80952a993595b486ba27cf0f9784f8a1647c2cd531e6f61a4801d61a3ef2a4be0a9c93b87f85eb183be8c526439f03dfb0f0be

data/lib/effective_test_bot.rb

@@ -7,6 +7,8 @@ module EffectiveTestBot
   mattr_accessor :screenshots
   mattr_accessor :autosave_animated_gif_on_failure
   mattr_accessor :tour_mode
+  mattr_accessor :animated_gif_delay
+  mattr_accessor :animated_gif_background_color
 
   def self.setup
     yield self

data/lib/effective_test_bot/version.rb

@@ -1,3 +1,3 @@
 module EffectiveTestBot
-  VERSION = '0.4.4'.freeze
+  VERSION = '0.4.5'.freeze
 end

data/lib/generators/templates/effective_test_bot.rb

@@ -26,11 +26,22 @@ if Rails.env.test?
     # Take the tour!
     # Generate an animated gif for each test
     # Saved to an appropriate /test/tour/* directory
+    # Also enabled the crud_test #tour type tests
+    #
     # You can override this default by setting an ENV or calling
     # `rake test:bot TOUR=true`   or `rake test:bot TEST=posts TOUR=verbose`
     #
     # Valid values are true / false / :verbose
     config.tour_mode = false
 
+    # How long to delay in between animated gif frames
+    # The last frame is applied animated_gif_frame_delay * 3
+    # 100 equals 1 second. (a bit on the slow side, but suitable for a demo)
+    config.animated_gif_delay = 100
+
+    # Shorter than maximum height animaged gif frames have their
+    # bottom area filled by this color
+    # For best appearance, have this match your site's background color
+    config.animated_gif_background_color = 'white'
   end
 end

data/lib/tasks/effective_test_bot_tasks.rake

@@ -7,9 +7,16 @@ require 'rails/test_unit/sub_test_task'
 # rake test:bot TOUR=true
 # rake test:bot TOUR=verbose
 
+# rake test:bot:tour
+# rake test:bot:tour TEST=documents#new
+
 # rake test:bot:environment
 # rake test:bot:purge
 
+# rake test:bot:tours
+# rake test:bot:tours TEST=documents
+
+
 namespace :test do
   desc 'Runs the effective_test_bot'
   task :bot do
@@ -29,11 +36,36 @@ namespace :test do
 
     desc 'Deletes all effective_test_bot temporary, failure and tour screenshots'
     task :purge do
-      FileUtils.rm_rf(Rails.root + 'test/tour')
+      FileUtils.rm_rf(Rails.root + 'test/tours')
       FileUtils.rm_rf(Rails.root + 'tmp/test_bot')
       puts "Successfully purged all effective_test_bot screenshots"
     end
-  end
+
+    desc 'Runs effective_test_bot environment test in tour mode'
+    task :tour do
+      ENV['TOUR'] ||= 'true'
+      Rake::Task['test:bot'].invoke
+    end
+
+    desc 'Runs effective_test_bot environment test in verbose tour mode'
+    task :tourv do
+      ENV['TOUR'] ||= 'verbose'
+      Rake::Task['test:bot'].invoke
+    end
+
+    desc 'Prints all effective_test_bot animated gif tour file paths'
+    task :tours do
+      Dir['test/tours/*.gif'].each do |file|
+        file = file.to_s
+
+        if ENV['TEST'].present?
+          next unless file.include?(ENV['TEST'])
+        end
+
+        puts "\e[32m#{Rails.root + file}\e[0m" # 32 is green
+      end
+    end
+  end # /namespace bot
 
   Rails::TestTask.new('effective_test_bot' => 'test:prepare') do |t|
     t.libs << 'test'

data/test/concerns/test_botable/crud_dsl.rb

@@ -12,7 +12,7 @@ module TestBotable
   module CrudDsl
     extend ActiveSupport::Concern
 
-    CRUD_TESTS = [:new, :create_valid, :create_invalid, :edit, :update_valid, :update_invalid, :index, :show, :destroy]
+    CRUD_TESTS = [:index, :new, :create_invalid, :create_valid, :show, :edit, :update_invalid, :update_valid, :destroy, (:tour if EffectiveTestBot.tour_mode?)].compact
 
     module ClassMethods
 
@@ -29,14 +29,15 @@ module TestBotable
         label = options.delete(:label).presence
         only = options.delete(:only)
         except = options.delete(:except)
+        current_crud_tests = crud_tests_to_define(only, except)
 
         begin
-          normalize_test_bot_options!(options.merge!(user: user, resource: resource))
+          normalize_test_bot_options!(options.merge!(user: user, resource: resource, current_crud_tests: current_crud_tests))
         rescue => e
           raise "Error: #{e.message}.  Expected usage: crud_test(Post || Post.new, User.first, only: [:new, :create], skip: {create_invalid: [:path]})"
         end
 
-        crud_tests_to_define(only, except).each do |test|
+        current_crud_tests.each do |test|
           options_for_method = options.dup
 
           options_for_method[:skips] = Array(skips[test]) if skips[test]

data/test/support/effective_test_bot_assertions.rb

@@ -22,6 +22,10 @@ module EffectiveTestBotAssertions
     end
   end
 
+  def assert_submit_input(message = "(submit_input) Expected one or more input[type='submit'] to be present")
+    assert_selector 'input[type=submit]', message
+  end
+
   def assert_page_status(status = 200, message = '(page_status) Expected :status: HTTP status code')
     assert_equal status, page.status_code, message.sub(':status:', status.to_s)
   end
@@ -61,6 +65,15 @@ module EffectiveTestBotAssertions
     assert errors.blank?, message || "(no_html5_form_validation_errors) Unable to submit form, unexpected HTML5 validation error present on the following fields:\n#{errors.join("\n")}"
   end
 
+  # Rails jquery-ujs data-disable-with
+  # = f.button :submit, 'Save', data: { disable_with: 'Saving...' }
+  def assert_jquery_ujs_disable_with(label = nil, message = nil)
+    submits = label.present? ? [find(:link_or_button, label)] : all("input[type='submit']")
+    all_disabled_with = submits.all? { |submit| submit['data-disable-with'].present? }
+
+    assert all_disabled_with, message || "(jquery_ujs_disable_with) Expected rails jquery-ujs data-disable-with to be present on #{(label || "all input[type='submit'] fields")}\nInclude it on your submit buttons by adding \"data: { disable_with: 'Saving...' }\""
+  end
+
   # assert_flash
   # assert_flash :success
   # assert_flash :error, 'there was a specific error'

data/test/support/effective_test_bot_form_filler.rb

@@ -19,7 +19,7 @@ module EffectiveTestBotFormFiller
     # clicking each one and filling any form fields found within
 
     active_tab = find("li.active > a[data-toggle='tab']")
-    tab_content = find("div#{active_tab['href']}").find(:xpath, '..')
+    tab_content = find('div' + active_tab['href']).find(:xpath, '..')
 
     excluding_fields_with_parent(tab_content) { fill_form_fields(fills) }
 
@@ -34,7 +34,7 @@ module EffectiveTestBotFormFiller
       synchronize!
       save_test_bot_screenshot
 
-      within("div#{tab['href']}") { fill_form_fields(fills) }
+      within('div' + tab['href']) { fill_form_fields(fills) }
     end
 
   end
@@ -50,8 +50,9 @@ module EffectiveTestBotFormFiller
       2.times { field.click(); save_test_bot_screenshot }
     end
 
-    all('input,select,textarea').each do |field|
+    all('input,select,textarea', visible: false).each do |field|
       next if skip_form_field?(field)
+      skip_field_screenshot = false
 
       case [field.tag_name, field['type']].compact.join('_')
       when 'input_text', 'input_email', 'input_password', 'input_tel', 'input_number', 'input_checkbox', 'input_radio', 'textarea'
@@ -70,12 +71,13 @@ module EffectiveTestBotFormFiller
           field.set(value_for_field(field, fills))
         end
       when 'input_submit', 'input_search'
+        skip_field_screenshot = true
         # Do nothing
       else
         raise "unsupported field type #{[field.tag_name, field['type']].compact.join('_')}"
       end
 
-      save_test_bot_screenshot
+      save_test_bot_screenshot unless skip_field_screenshot
     end
   end
 
@@ -87,6 +89,7 @@ module EffectiveTestBotFormFiller
   def value_for_field(field, fills = nil)
     field_name = [field.tag_name, field['type']].compact.join('_')
     attributes = field['name'].to_s.gsub(']', '').split('[') # user[something_attributes][last_name] => ['user', 'something_attributes', 'last_name']
+    attribute = attributes.last.to_s
 
     fill_value = fill_value_for_field(fills, attributes)
 
@@ -102,17 +105,19 @@ module EffectiveTestBotFormFiller
       classes = field['class'].to_s.split(' ')
 
       if classes.include?('date') # Let's assume this is a date input.
-        if attributes.last.to_s.include?('end') # Make sure end dates are after start dates
+        if attribute.include?('end') # Make sure end dates are after start dates
           Faker::Date.forward(365).strftime('%Y-%m-%d')
         else
           Faker::Date.backward(365).strftime('%Y-%m-%d')
         end
       elsif classes.include?('datetime')
-        if attributes.last.to_s.include?('end')
+        if attribute.include?('end')
           Faker::Date.forward(365).strftime('%Y-%m-%d %H:%m')
         else
           Faker::Date.backward(365).strftime('%Y-%m-%d %H:%m')
         end
+      elsif classes.include?('email') || attribute.include?('email')
+        Faker::Internet.email
       elsif classes.include?('price') # effective_form_inputs price
         4.times.map { DIGITS.sample }.join('') + '.00'
       elsif classes.include?('numeric')
@@ -120,16 +125,26 @@ module EffectiveTestBotFormFiller
         max = (Float(field['max']) rescue 1000)
         number = Random.new.rand(min..max)
         number.kind_of?(Float) ? number.round(2) : number
-      elsif attributes.last.to_s.include?('first_name')
+      elsif attribute.include?('first_name')
         Faker::Name.first_name
-      elsif attributes.last.to_s.include?('last_name')
+      elsif attribute.include?('last_name')
         Faker::Name.last_name
-      elsif attributes.last.to_s.include?('name')
+      elsif attribute.include?('website')
+        Faker::Internet.url
+      elsif attribute.include?('city')
+        Faker::Address.city
+      elsif attribute.include?('address2')
+        Faker::Address.secondary_address
+      elsif attribute.include?('address')
+        Faker::Address.street_address
+      elsif attribute.include?('name')
         Faker::Name.name
-      elsif attributes.last.to_s.include?('postal') # Make a Canadian Postal Code
+      elsif attribute.include?('postal') # Make a Canadian postal code
         LETTERS.sample + DIGITS.sample + LETTERS.sample + ' ' + DIGITS.sample + LETTERS.sample + DIGITS.sample
+      elsif attribute.include?('zip') && attribute.include?('code') # Make a US zip code
+        DIGITS.sample + DIGITS.sample + DIGITS.sample + DIGITS.sample + DIGITS.sample
       else
-        Faker::Lorem.word
+        Faker::Lorem.words(3).join(' ').capitalize
       end
 
     when 'select'
@@ -154,13 +169,13 @@ module EffectiveTestBotFormFiller
       d = 10.times.map { DIGITS.sample }
       d[0] + d[1] + d[2] + '-' + d[3] + d[4] + d[5] + '-' + d[6] + d[7] + d[8] + d[9]
     when 'textarea'
-      Faker::Lorem.sentence
+      Faker::Lorem.paragraph
     when 'input_checkbox'
       [true, false].sample
     when 'input_radio'
       [true, false].sample
     when 'input_file'
-      "#{File.dirname(__FILE__)}/effective_assets_upload_file._test"
+      "#{File.dirname(__FILE__)}/important_documents._test"
     else
       raise "fill_value unsupported field type: #{field['type']}"
     end
@@ -230,6 +245,8 @@ module EffectiveTestBotFormFiller
   end
 
   def skip_form_field?(field)
+    field.reload # Handle a field changing visibility/disabled state from previous form field manipulations
+
     field.visible? == false ||
     field.disabled? ||
     ['true', true, 1].include?(field['data-test-bot-skip']) ||

data/test/support/effective_test_bot_form_helper.rb

@@ -19,6 +19,7 @@ module EffectiveTestBotFormHelper
   # This submits the form, while checking for html5 form validation errors and unpermitted params
   def submit_form(label = nil)
     assert_no_html5_form_validation_errors unless test_bot_skip?(:no_html5_form_validation_errors)
+    assert_jquery_ujs_disable_with(label) unless test_bot_skip?(:jquery_ujs_disable_with)
 
     if test_bot_skip?(:no_unpermitted_params)
       click_submit(label)
@@ -62,7 +63,7 @@ module EffectiveTestBotFormHelper
       page.execute_script "$('input[data-disable-with]').each(function(i) { $.rails.enableFormElement($(this)); });"
     end
 
-    label.present? ? click_on(label) : first(:css, "input[type='submit']").click
+    label.present? ? find(:link_or_button, label).click : first(:css, "input[type='submit']").click
     synchronize!
   end
 

data/test/support/effective_test_bot_screenshots_helper.rb

@@ -9,9 +9,6 @@ module EffectiveTestBotScreenshotsHelper
 
     full_path = current_test_temp_path + '/' + "#{current_test_screenshot_id}.png"
     page.save_screenshot(full_path)
-
-    #i = Magick::Image.read(file).first
-    #i.resize_to_fill(100,100).write("#{file}-square-thumb.jpg")
   end
 
   # This is run before every test
@@ -80,18 +77,21 @@ module EffectiveTestBotScreenshotsHelper
 
     # Remove the PNG's alpha channel, 'cause .gifs dont support it
     # Extend the bottom/right of each image to extend upto dimension
+    delay = [(EffectiveTestBot.animated_gif_delay.to_i rescue 0), 10].max
+    last_image = images.last
+
     images.each do |image|
       image.alpha Magick::DeactivateAlphaChannel
-      #image.background_color = 'white'
+      image.delay = (image == last_image) ? (delay * 4) : delay
+      image.background_color = EffectiveTestBot.animated_gif_background_color
+
       animation << image.extent(dimensions[:width], dimensions[:height])
     end
 
-    # Run it through optimize layers.
-    # https://rmagick.github.io/ilist.html#optimize_layers
-    animation = animation.optimize_layers(Magick::OptimizePlusLayer)
+    # Run it through https://rmagick.github.io/ilist.html#optimize_layers
+    animation = animation.optimize_layers(Magick::OptimizeLayer)
 
     # Write the final animated gif
-    animation.delay = 100 # 100 is the right setting
     animation.write(full_path)
   end
 
@@ -101,7 +101,7 @@ module EffectiveTestBotScreenshotsHelper
   # current_test_failure_path: destination for .gifs of failing tests
 
   def current_test_temp_path
-    @_current_test_temp_path ||= File.join(Rails.root, 'tmp', 'test_bot', current_test)
+    @_current_test_temp_path ||= File.join(Rails.root, 'tmp', 'test_bot', current_test || 'none')
   end
 
   def current_test_failure_path
@@ -115,7 +115,7 @@ module EffectiveTestBotScreenshotsHelper
 
   # Where the tour animated gif ends up
   def current_test_tour_path
-    File.join(Rails.root, 'test', 'tour')
+    File.join(Rails.root, 'test', 'tours')
   end
 
   def current_test_tour_filename

data/test/support/effective_test_bot_test_helper.rb

@@ -13,12 +13,6 @@ module EffectiveTestBotTestHelper
     session.driver.submit :delete, path, {}
     session.document.find('html')
 
-    # Assign the Flash and Assigns
-    @flash = (JSON.parse(Base64.decode64(session.driver.response_headers['Test-Bot-Flash'])) rescue {})
-    @assigns = (JSON.parse(Base64.decode64(session.driver.response_headers['Test-Bot-Assigns'])) rescue {})
-    @unpermitted_params = (JSON.parse(Base64.decode64(session.driver.response_headers['Test-Bot-Unpermitted-Params'])) rescue [])
-    @exceptions = (JSON.parse(Base64.decode64(session.driver.response_headers['Test-Bot-Exceptions'])) rescue [])
-
     @visit_delete_page = session
   end
 
@@ -38,19 +32,19 @@ module EffectiveTestBotTestHelper
   # EffectiveTestBot includes an after_filter on ApplicationController to set an http header
   # These values are 'from the last page submit or refresh'
   def flash
-    @flash ||= (JSON.parse(Base64.decode64(page.response_headers['Test-Bot-Flash'])) rescue {})
+    (JSON.parse(Base64.decode64(page.response_headers['Test-Bot-Flash'])) rescue {})
   end
 
   def assigns
-    @assigns ||= (JSON.parse(Base64.decode64(page.response_headers['Test-Bot-Assigns'])) rescue {})
+    (JSON.parse(Base64.decode64(page.response_headers['Test-Bot-Assigns'])) rescue {})
   end
 
   def unpermitted_params
-    @unpermitted_params ||= (JSON.parse(Base64.decode64(page.response_headers['Test-Bot-Unpermitted-Params'])) rescue [])
+    (JSON.parse(Base64.decode64(page.response_headers['Test-Bot-Unpermitted-Params'])) rescue [])
   end
 
   def exceptions
-    @exceptions ||= (JSON.parse(Base64.decode64(page.response_headers['Test-Bot-Exceptions'])) rescue [])
+    (JSON.parse(Base64.decode64(page.response_headers['Test-Bot-Exceptions'])) rescue [])
   end
 
 end

data/test/test_bot/integration/application_test.rb

@@ -40,7 +40,10 @@ module TestBot
             # If we're done accumulating CRUD actions, launch the crud_test with all seen actions
             if controller != next_controller || CRUD_ACTIONS.include?(next_action) == false
               begin
-                crud_test(controller, User.first, only: seen_actions.delete(controller))
+                only_tests = seen_actions.delete(controller)
+                only_tests << :tour if EffectiveTestBot.tour_mode?
+
+                crud_test(controller, User.first, only: only_tests)
               rescue => e
                 puts e.message # Sometimes there is an object that can't be instantiated, so we still want to continue the application test
               end

data/test/test_botable/base_test.rb

@@ -48,6 +48,25 @@ module BaseTest
     resource_class.last
   end
 
+  # Try to find a link_to_delete already on this page
+  # Otherwise create one
+  # Returns the link element
+  def find_or_create_rails_ujs_link_to_delete(resource)
+    selector = "a[href='#{resource_path(resource)}'][data-method='delete']"
+    link_to_delete = page.document.all(selector, visible: false).first # could be nil, but this is a non-blocking selector
+
+    if link_to_delete.present? # Take excessive efforts to ensure it's visible and clickable
+      page.execute_script("$('body').prepend($(\"#{selector}\").first().clone().show().removeProp('disabled').html('Delete'));")
+    else  # Create our own link
+      page.execute_script("$('body').prepend($('<a>').attr({href: '#{resource_path(resource)}', 'data-method': 'delete', 'data-confirm': 'Are you sure?'}).html('Delete'));")
+    end
+
+    # capybara-webkit doesn't seem to stop on the alert 'Are you sure?'.
+    # Otherwise we'd want to take a screenshot of it
+
+    (page.document.first(:css, selector) rescue nil)
+  end
+
   def resources_path # index, create
     polymorphic_path([*controller_namespace, resource_class])
   end

data/test/test_botable/crud_test.rb

@@ -4,6 +4,32 @@
 module CrudTest
   protected
 
+  # So this runs every single test over again, but in a screenshot optimized manner
+  def test_bot_tour_test
+    # This is set by the crud_dsl, from application_test.  It makes sure we don't run a show test if theres no show action
+    tests = defined?(current_crud_tests) ? current_crud_tests : []
+    tests = tests - [:tour, 'tour'] # Ensure tour doesn't somehow get in here, as it'll recurse forever
+
+    tests.each { |test| send("test_bot_#{test}_test") }
+
+    visit resources_path
+    save_test_bot_screenshot
+  end
+
+  def test_bot_index_test
+    sign_in(user) and (resource = (find_or_create_resource! rescue nil))
+
+    visit resources_path
+    save_test_bot_screenshot
+
+    assert_page_normal
+
+    assert(
+      (assigns['datatable'].present? || assigns[resource_name.pluralize].present?),
+      "(assigns) Expected @#{resource_name.pluralize} or @datatable to be present"
+    ) unless test_bot_skip?(:assigns)
+  end
+
   def test_bot_new_test
     sign_in(user) and visit(new_resource_path)
     save_test_bot_screenshot
@@ -13,64 +39,74 @@ module CrudTest
 
     # Make sure there's a form with a submit button
     form_selector = "form#new_#{resource_name}"
-
     assert_selector form_selector, "Expected form with selector #{form_selector}"
+
     within(form_selector) do
-      assert_selector 'input[type=submit]', 'Expected submit button to be present'
+      assert_submit_input unless test_bot_skip?(:submit_input)
+      assert_jquery_ujs_disable_with unless test_bot_skip?(:jquery_ujs_disable_with)
     end
 
   end
 
-  def test_bot_create_valid_test
+  def test_bot_create_invalid_test
     sign_in(user) and visit(new_resource_path)
-    save_test_bot_screenshot
 
-    before = { count: resource_class.count, path: page.current_path }
+    before = { count: resource_class.count }
 
     within("form#new_#{resource_name}") do
-      fill_form(resource_attributes)
-      submit_form
+      without_screenshots { clear_form }
+      submit_novalidate_form
     end
 
     save_test_bot_screenshot
 
-    after = { count: resource_class.count, path: page.current_path }
+    after = { count: resource_class.count }
 
     assert_page_normal
 
-    refute_equal before[:count], after[:count], "Expected fill_form to create a #{resource_class} object"
-    refute_equal(before[:path], after[:path], "(path) Expected unique before and after paths") unless test_bot_skip?(:path)
+    assert_assigns(resource_name) unless test_bot_skip?(:assigns)
+    assert_assigns_errors(resource_name) unless test_bot_skip?(:assigns_errors)
 
-    # In a rails controller, if I redirect to resources_path it may not assign the instance variable
-    # Wheras if I redirect to edit_resource_path I must ensure that the instance variable is set
-    assert_assigns(resource_name) if (after[:path].include?('/edit/') && !test_bot_skip?(:assigns))
-    assert_no_assigns_errors(resource_name) unless test_bot_skip?(:no_assigns_errors)
+    assert_equal before[:count], after[:count], "Expected #{resource_class}.count to be unchanged"
+    assert_equal(resources_path, page.current_path, "(path) Expected current_path to match resource #create path #{resources_path}") unless test_bot_skip?(:path)
+
+    assert_flash(:danger) unless test_bot_skip?(:flash)
   end
 
-  def test_bot_create_invalid_test
+  def test_bot_create_valid_test
     sign_in(user) and visit(new_resource_path)
+    save_test_bot_screenshot
 
-    before = { count: resource_class.count }
+    before = { count: resource_class.count, path: page.current_path }
 
     within("form#new_#{resource_name}") do
-      without_screenshots { clear_form }
-      submit_novalidate_form
+      fill_form(resource_attributes)
+      submit_form
     end
 
     save_test_bot_screenshot
 
-    after = { count: resource_class.count }
+    after = { count: resource_class.count, path: page.current_path }
 
     assert_page_normal
 
-    assert_equal before[:count], after[:count], "Expected #{resource_class}.count to be unchanged"
+    # In a rails controller, if I redirect to resources_path it may not assign the instance variable
+    # Wheras if I redirect to edit_resource_path I must ensure that the instance variable is set
+    assert_assigns(resource_name) if (after[:path].include?('/edit/') && !test_bot_skip?(:assigns))
+    assert_no_assigns_errors(resource_name) unless test_bot_skip?(:no_assigns_errors)
 
-    assert_assigns(resource_name) unless test_bot_skip?(:assigns)
-    assert_assigns_errors(resource_name) unless test_bot_skip?(:assigns_errors)
+    refute_equal before[:count], after[:count], "Expected fill_form to create a #{resource_class} object"
+    refute_equal(before[:path], after[:path], "(path) Expected unique before and after paths") unless test_bot_skip?(:path)
+  end
 
-    assert_flash(:danger) unless test_bot_skip?(:flash)
+  def test_bot_show_test
+    sign_in(user) and (resource = find_or_create_resource!)
 
-    assert_equal(resources_path, page.current_path, "(path) Expected current_path to match resource #create path #{resources_path}") unless test_bot_skip?(:path)
+    visit resource_path(resource)
+    save_test_bot_screenshot
+
+    assert_page_normal
+    assert_assigns(resource_name) unless test_bot_skip?(:assigns)
   end
 
   def test_bot_edit_test
@@ -80,18 +116,19 @@ module CrudTest
     save_test_bot_screenshot
 
     assert_page_normal
-    assert_assigns(resource_name) unless test_bot_skip?(:assigns)
+    assert_assigns(resource_name) # unskippable
 
     # Make sure there's a form with a submit button
     form_selector = "form#edit_#{resource_name}_#{resource.id}"
-
     assert_selector form_selector, "Expected form with selector #{form_selector}"
+
     within(form_selector) do
-      assert_selector 'input[type=submit]', 'Expected input[type=submit] to be present'
+      assert_submit_input unless test_bot_skip?(:submit_input)
+      assert_jquery_ujs_disable_with unless test_bot_skip?(:jquery_ujs_disable_with)
     end
   end
 
-  def test_bot_update_valid_test
+  def test_bot_update_invalid_test
     sign_in(user) and (resource = find_or_create_resource!)
 
     visit(edit_resource_path(resource))
@@ -100,8 +137,8 @@ module CrudTest
     before = { count: resource_class.count, updated_at: (resource.updated_at rescue nil) }
 
     within("form#edit_#{resource_name}_#{resource.id}") do
-      fill_form(resource_attributes)
-      submit_form
+      clear_form
+      submit_novalidate_form
     end
 
     save_test_bot_screenshot
@@ -112,19 +149,19 @@ module CrudTest
 
     assert_page_normal
 
-    assert_no_assigns_errors(resource_name) unless test_bot_skip?(:no_assigns_errors)
+    assert_assigns(resource_name) unless test_bot_skip?(:assigns)
+    assert_assigns_errors(resource_name) unless test_bot_skip?(:assigns_errors)
 
-    assert_equal before[:count], after[:count], "Expected #{resource_class}.count to be unchanged" unless test_bot_skip?(:count)
-    refute_equal(before[:updated_at], after[:updated_at], "(updated_at) Expected @#{resource_name}.updated_at to have changed") if (resource.respond_to?(:updated_at) && !test_bot_skip?(:updated_at))
+    assert_equal(resource_path(resource), page.current_path, "(path) Expected current_path to match resource #update path") unless test_bot_skip?(:path)
 
-    assert_flash(:success) unless test_bot_skip?(:flash)
+    assert_equal before[:count], after[:count], "Expected: #{resource_class}.count to be unchanged"
+    assert_equal(before[:updated_at], after[:updated_at], "(updated_at) Expected @#{resource_name}.updated_at to be unchanged") if (resource.respond_to?(:updated_at) && !test_bot_skip?(:updated_at))
+
+    assert_flash(:danger) unless test_bot_skip?(:flash)
 
-    # In a rails controller, if i redirect to resources_path it may not assign the instance variable
-    # Wheras if I redirect to edit_resource_path I must ensure that the instance variable is set
-    assert_assigns(resource_name) if (after[:path] == edit_resource_path(resource) && !test_bot_skip?(:assigns))
   end
 
-  def test_bot_update_invalid_test
+  def test_bot_update_valid_test
     sign_in(user) and (resource = find_or_create_resource!)
 
     visit(edit_resource_path(resource))
@@ -133,8 +170,8 @@ module CrudTest
     before = { count: resource_class.count, updated_at: (resource.updated_at rescue nil) }
 
     within("form#edit_#{resource_name}_#{resource.id}") do
-      clear_form
-      submit_novalidate_form
+      fill_form(resource_attributes)
+      submit_form
     end
 
     save_test_bot_screenshot
@@ -143,40 +180,19 @@ module CrudTest
 
     after = { count: resource_class.count, updated_at: (resource.updated_at rescue nil) }
 
-    assert_page_normal
-    assert_equal before[:count], after[:count], "Expected: #{resource_class}.count to be unchanged"
-
-    assert_assigns(resource_name) unless test_bot_skip?(:assigns)
-    assert_assigns_errors(resource_name) unless test_bot_skip?(:assigns_errors)
-    assert_equal(before[:updated_at], after[:updated_at], "(updated_at) Expected @#{resource_name}.updated_at to be unchanged") if (resource.respond_to?(:updated_at) && !test_bot_skip?(:updated_at))
-
-    assert_flash(:danger) unless test_bot_skip?(:flash)
-
-    assert_equal(resource_path(resource), page.current_path, "(path) Expected current_path to match resource #update path") unless test_bot_skip?(:path)
-  end
-
-  def test_bot_index_test
-    sign_in(user) and (resource = (find_or_create_resource! rescue nil))
-
-    visit resources_path
-    save_test_bot_screenshot
-
     assert_page_normal
 
-    assert(
-      (assigns['datatable'].present? || assigns[resource_name.pluralize].present?),
-      "(assigns) Expected @#{resource_name.pluralize} or @datatable to be present"
-    ) unless test_bot_skip?(:assigns)
-  end
-
-  def test_bot_show_test
-    sign_in(user) and (resource = find_or_create_resource!)
+    # In a rails controller, if i redirect to resources_path it may not assign the instance variable
+    # Wheras if I redirect to edit_resource_path I must ensure that the instance variable is set
+    if after[:path] == edit_resource_path(resource)
+      assert_assigns(resource_name) unless !test_bot_skip?(:assigns)
+    end
+    assert_no_assigns_errors(resource_name) unless test_bot_skip?(:no_assigns_errors)
 
-    visit resource_path(resource)
-    save_test_bot_screenshot
+    assert_equal before[:count], after[:count], "Expected #{resource_class}.count to be unchanged" unless test_bot_skip?(:count)
+    refute_equal(before[:updated_at], after[:updated_at], "(updated_at) Expected @#{resource_name}.updated_at to have changed") if (resource.respond_to?(:updated_at) && !test_bot_skip?(:updated_at))
 
-    assert_page_normal
-    assert_assigns(resource_name) unless test_bot_skip?(:assigns)
+    assert_flash(:success) unless test_bot_skip?(:flash)
   end
 
   def test_bot_destroy_test
@@ -184,17 +200,31 @@ module CrudTest
 
     before = { count: resource_class.count, archived: (resource.archived rescue nil) }
 
-    visit_delete(resource_path(resource), user)
+    # We're going to try to visit the index page and create a link to delete
+    visit(resources_path)
+    save_test_bot_screenshot
 
-    after = { count: resource_class.count, archived: (resource_class.find(resource.id).archived rescue nil) }
+    link_to_delete = find_or_create_rails_ujs_link_to_delete(resource)
 
-    # Because of the way delete works, we can't use assert_page_normal()
-    # So we just assert the 200 status code, and page title present manually
-    # Javascript errors cannot be detected
-    assert_equal(200, @visit_delete_page.try(:status_code), '(page_status) Expected 200 HTTP status code') unless test_bot_skip?(:page_status)
-    assert((@visit_delete_page.find(:xpath, '//title', visible: false) rescue nil).present?, '(page_title) Expected page title to be present') unless test_bot_skip?(:page_title)
+    if link_to_delete.present? && (link_to_delete.click() rescue false)
+      synchronize!
+      save_test_bot_screenshot
 
-    assert_flash(:success) unless test_bot_skip?(:flash)
+      assert_page_normal
+      assert_flash(:success) unless test_bot_skip?(:flash)
+    else
+      # Capybara-webkit can't just make a DELETE request, so we fallback to Selenium
+      # We can't use our normal helpers assert_page_normal()
+      # So we just assert the 200 status code, and page title present manually
+      # Javascript errors cannot be detected
+
+      puts 'test_bot_destroy_test failed to find_or_create_rails_ujs_link_to_delete  Falling back to selenium DELETE request.'
+      visit_delete(resource_path(resource), user)
+      assert_equal(200, @visit_delete_page.try(:status_code), '(page_status) Expected 200 HTTP status code') unless test_bot_skip?(:page_status)
+      assert((@visit_delete_page.find(:xpath, '//title', visible: false) rescue nil).present?, '(page_title) Expected page title to be present') unless test_bot_skip?(:page_title)
+    end
+
+    after = { count: resource_class.count, archived: (resource_class.find(resource.id).archived rescue nil) }
 
     if resource.respond_to?(:archived)
       assert_equal(true, after[:archived], "Expected #{resource_class}.archived? to be true")
@@ -202,4 +232,5 @@ module CrudTest
       assert_equal before[:count]-1, after[:count], "Expected: #{resource_class}.count to decrement by 1"
     end
   end
+
 end

data/test/test_botable/page_test.rb

@@ -14,8 +14,6 @@ module PageTest
     end
 
     assert_page_normal
-
-    #page.save_screenshot("#{page_path.to_s.parameterize}.png")
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_test_bot
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-11 00:00:00.000000000 Z
+date: 2015-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -232,13 +232,13 @@ files:
 - test/concerns/test_botable/page_dsl.rb
 - test/concerns/test_botable/redirect_dsl.rb
 - test/concerns/test_botable/wizard_dsl.rb
-- test/support/effective_assets_upload_file._test
 - test/support/effective_test_bot_assertions.rb
 - test/support/effective_test_bot_form_filler.rb
 - test/support/effective_test_bot_form_helper.rb
 - test/support/effective_test_bot_login_helper.rb
 - test/support/effective_test_bot_screenshots_helper.rb
 - test/support/effective_test_bot_test_helper.rb
+- test/support/important_documents._test
 - test/test_bot/integration/application_test.rb
 - test/test_bot/integration/environment_test.rb
 - test/test_botable/base_test.rb