effective_test_bot 0.4.13 → 0.4.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d9f3e47968588a874f9e16b0fbefa9e98ee9aee
-  data.tar.gz: c025706727691c283a8d99a1e902ae4ae5d61cc4
+  metadata.gz: 0c57de4dc4b6c0cf80fe3cefea43adb80d683bde
+  data.tar.gz: a2f0200f1fb20a3df4272adf99e9858103630fe8
 SHA512:
-  metadata.gz: ffecc7b971cf73a4bf2d62e1c8a20d7978a4b81173fe2329c5da48fa5b5072b4ab9dd42bdd66420ee8182c94bafb379621c8d9dc9fa01a9469d82c1745ffe4a3
-  data.tar.gz: 0fbab2527ee173d00b150aad9f15a038736d0a067b6649ec9b72c30e535dec983a3037da1a56a5e685d8162ebaca445d1baa03042f9442f0c9c5a00cdc56c2ab
+  metadata.gz: ca5a005d6ecf7d17b699f615bd1b953f4607718a2f4ee6f5349d6f55506a73f974826287033927292aef55dd5875d0baae5a2bc29aaaf58be87f426346d0c2e0
+  data.tar.gz: bc67e5f134111162842ef992a4451e3dfd49ce235fee9d2505b355a8aef54a0858ab6c88a21aa03003f760b43c961f85779ecc1bc6a2e12138031a5d8173afed

data/README.md

@@ -99,22 +99,24 @@ Effective TestBot provides 4 areas of support in writing [minitest](https://gith
 
 The following assertions are added for use in any integration test:
 
-- `assert_signed_in` visits the devise `new_user_session_path` and checks for the already signed in content.
-- `assert_signed_out` visits the devise `new_user_session_path` and checks for the sign in content.
-- `assert_page_title` makes sure there is an html `<title></title>` present.
-- `assert_submit_input` makes sure there is an `input[type='submit']` present.
-- `assert_page_status` checks for a given http status, default 200.
+- `assert_assigns` asserts a given rails view_assigns object is present.
+- `assert_assigns_errors` use after an intentionally invalid form submit to make sure your assigned rails object has errors, or a specific error.
+- `assert_no_assigns_errors` should be used after any form submit to make sure your assigned rails object has no errors.  Prints out any errors if they exist.
 - `assert_current_path(path)` asserts the current page path.
-- `assert_redirect(from_path)` optionally with to_path, makes sure the current page path is not from_path.
-- `assert_no_js_errors` - checks for any javascript errors on the page.
-- `assert_no_unpermitted_params` makes sure the last submitted form did not include any unpermitted params and prints out any unpermitted params that do exist.
+- `assert_flash`, optionally with the desired `:success`, `:error` key and/or message, makes sure the flash is set.
+- `assert_jquery_ujs_disable_with` makes sure all `input[type=submit]` elements on the page have the `data-disable-with` property set.
 - `assert_no_exceptions` checks for any exceptions in the last page request and gives a stacktrace if there was.
 - `assert_no_html_form_validation_errors` checks for frontend html5 errors.
-- `assert_jquery_ujs_disable_with` makes sure all `input[type=submit]` elements on the page have the `data-disable-with` property set.
-- `assert_flash`, optionally with the desired `:success`, `:error` key and/or message, makes sure the flash is set.
-- `assert_assigns` asserts a given rails view_assigns object is present.
-- `assert_no_assigns_errors` should be used after any form submit to make sure your assigned rails object has no errors.  Prints out any errors if they exist.
-- `assert_assigns_errors` use after an intentionally invalid form submit to make sure your assigned rails object has errors, or a specific error.
+- `assert_no_js_errors` - checks for any javascript errors on the page.
+- `assert_no_unpermitted_params` makes sure the last submitted form did not include any unpermitted params and prints out any unpermitted params that do exist.
+- `assert_page_content(content)` checks that the given content is present without waiting the capybara default wait time.
+- `assert_no_page_content(content)` checks that the given content is blank without waiting the capybara default wait time.
+- `assert_page_status` checks for a given http status, default 200.
+- `assert_page_title` makes sure there is an html `<title></title>` present.
+- `assert_redirect(from_path)` optionally with to_path, makes sure the current page path is not from_path.
+- `assert_signed_in` checks that the assigned `@current_user` is present.
+- `assert_signed_out` checks that the assigned `@current_user` is blank.
+- `assert_submit_input` makes sure there is an `input[type='submit']` present.
 
 As well,
 
@@ -181,15 +183,17 @@ end
 
 ### other helpers
 
-- `submit_novalidate_form` submits the form without client side validation, ignoring any required field requirements.
+- `as_user(user) do .. end` yields a block between `sign_in`, and `logout`.
 - `clear_form` clears all form fields, probably used before `submit_novalidate_form` to test invalid form submissions.
+- `click_first(label)` clicks the first link matching the given label
+- `submit_novalidate_form` submits the form without client side validation, ignoring any required field requirements.
 - `sign_in(user)` optionally with user, signs in via `Warden::Test::Helpers` hacky login skipping method.
 - `sign_in_manually(user, password)` visits the devise `new_user_session_path` and signs in via the form.
 - `sign_up` visits the devise `new_user_registration_path` and signs up as a new user.
-- `as_user(user) do .. end` yields a block between `sign_in`, and `logout`.
 - `synchronize!` should fix any timing issues waiting for page elements.
 - `was_redirect?` returns true/false if the last time we changed pages was a 304 redirect.
 - `was_download?` if clicking a link returned a file of any type rather than a page change.
+- `within_if(selector, boolean) do .. end` runs the block inside capybara's `within do .. end` if boolean is true, otherwise runs the same block skipping the `within`.
 
 ## Capybara Super Extras
 
@@ -269,14 +273,14 @@ The individual test suites may also be used as part of a larger test:
 class PostsTest < ActionDispatch::IntegrationTest
   test 'user may only update a post once' do
     crud_action_test(:create_valid, Post, User.first)
-    assert_content 'successfully created post.  You may only update it once.'
+    assert_text 'successfully created post.  You may only update it once.'
 
     crud_action_test(:update_valid, Post.last, User.first)
-    assert_content 'successfully updated post.'
+    assert_text 'successfully updated post.'
 
     crud_action_test(:update_valid, Post.last, User.first, skip: [:no_assigns_errors, :updated_at])
     assert_assigns_errors(:post, 'you may no longer update this post.')
-    assert_content 'you may no longer update this post.'
+    assert_text 'you may no longer update this post.'
   end
 end
 ```
@@ -305,7 +309,7 @@ Or each individually in part of a regular test:
 class MyApplicationTest < ActionDispatch::IntegrationTest
   test 'user receives 10 tokens after signing up' do
     devise_action_test(:sign_up)
-    assert_content 'Tokens: 10'
+    assert_text 'Tokens: 10'
     assert_equals 10, User.last.tokens
     assert_equals 10, assigns(:current_user).tokens
   end
@@ -372,7 +376,7 @@ class PostsTest < ActionDispatch::IntegrationTest
     page_action_test(:posts_path, User.first)
 
     assert page.current_path, '/posts'
-    assert_content 'first post'
+    assert_text 'first post'
   end
 end
 ```
@@ -397,7 +401,7 @@ class PostsTest < ActionDispatch::IntegrationTest
   test 'visiting blog redirects to posts' do
     Post.create(title: 'first post')
     redirect_action_test('/blog', '/posts', User.first)
-    assert_content 'first post'
+    assert_text 'first post'
   end
 end
 ```
@@ -425,7 +429,7 @@ class PostsTest < ActionDispatch::IntegrationTest
   test 'building a post in 5 steps' do
     wizard_action_test('/build_post/step1', '/build_post/step5', User.first) do
       if page.current_path.end_with?('step4')
-        assert_content 'your post is ready but must first be approved by an admin.'
+        assert_text 'your post is ready but must first be approved by an admin.'
       end
     end
   end

data/app/helpers/effective_test_bot_controller_helper.rb

@@ -30,10 +30,4 @@ module EffectiveTestBotControllerHelper
       response.headers['Test-Bot-Unpermitted-Params'] = Base64.encode64(exception.params.to_json)
     end
   end
-
-  def assign_test_bot_exceptions_header(exception)
-    info = [exception.message] + exception.backtrace.first(8)
-    response.headers['Test-Bot-Exceptions'] = Base64.encode64(info.to_json)
-  end
-
 end

data/lib/effective_test_bot.rb

@@ -1,4 +1,5 @@
 require "effective_test_bot/engine"
+require "effective_test_bot/middleware"
 require "effective_test_bot/version"
 
 module EffectiveTestBot

data/lib/effective_test_bot/engine.rb

@@ -13,32 +13,40 @@ module EffectiveTestBot
     end
 
     initializer 'effective_test_bot.test_suite' do |app|
-      Rails.application.config.to_prepare do
-        # test/support/
-        ActionDispatch::IntegrationTest.include EffectiveTestBotAssertions
-        ActionDispatch::IntegrationTest.include EffectiveTestBotFormHelper
-        ActionDispatch::IntegrationTest.include EffectiveTestBotFormFiller
-        ActionDispatch::IntegrationTest.include EffectiveTestBotLoginHelper
-        ActionDispatch::IntegrationTest.include EffectiveTestBotScreenshotsHelper
-        ActionDispatch::IntegrationTest.include EffectiveTestBotTestHelper
+      if Rails.env.test?
+        Rails.application.config.to_prepare do
+          # test/support/
+          ActionDispatch::IntegrationTest.include EffectiveTestBotAssertions
+          ActionDispatch::IntegrationTest.include EffectiveTestBotFormHelper
+          ActionDispatch::IntegrationTest.include EffectiveTestBotFormFiller
+          ActionDispatch::IntegrationTest.include EffectiveTestBotLoginHelper
+          ActionDispatch::IntegrationTest.include EffectiveTestBotScreenshotsHelper
+          ActionDispatch::IntegrationTest.include EffectiveTestBotTestHelper
 
-        # test/test_botable/
-        ActionDispatch::IntegrationTest.include BaseTest
-        ActionDispatch::IntegrationTest.include CrudTest
-        ActionDispatch::IntegrationTest.include DeviseTest
-        ActionDispatch::IntegrationTest.include MemberTest
-        ActionDispatch::IntegrationTest.include PageTest
-        ActionDispatch::IntegrationTest.include RedirectTest
-        ActionDispatch::IntegrationTest.include WizardTest
+          # test/test_botable/
+          ActionDispatch::IntegrationTest.include BaseTest
+          ActionDispatch::IntegrationTest.include CrudTest
+          ActionDispatch::IntegrationTest.include DeviseTest
+          ActionDispatch::IntegrationTest.include MemberTest
+          ActionDispatch::IntegrationTest.include PageTest
+          ActionDispatch::IntegrationTest.include RedirectTest
+          ActionDispatch::IntegrationTest.include WizardTest
 
-        # test/concerns/test_botable/
-        ActionDispatch::IntegrationTest.include TestBotable::BaseDsl
-        ActionDispatch::IntegrationTest.include TestBotable::CrudDsl
-        ActionDispatch::IntegrationTest.include TestBotable::DeviseDsl
-        ActionDispatch::IntegrationTest.include TestBotable::MemberDsl
-        ActionDispatch::IntegrationTest.include TestBotable::PageDsl
-        ActionDispatch::IntegrationTest.include TestBotable::RedirectDsl
-        ActionDispatch::IntegrationTest.include TestBotable::WizardDsl
+          # test/concerns/test_botable/
+          ActionDispatch::IntegrationTest.include TestBotable::BaseDsl
+          ActionDispatch::IntegrationTest.include TestBotable::CrudDsl
+          ActionDispatch::IntegrationTest.include TestBotable::DeviseDsl
+          ActionDispatch::IntegrationTest.include TestBotable::MemberDsl
+          ActionDispatch::IntegrationTest.include TestBotable::PageDsl
+          ActionDispatch::IntegrationTest.include TestBotable::RedirectDsl
+          ActionDispatch::IntegrationTest.include TestBotable::WizardDsl
+        end
+      end
+    end
+
+    initializer 'effective_test_bot.middleware' do |app|
+      if Rails.env.test?
+        Rails.application.config.middleware.use EffectiveTestBot::Middleware
       end
     end
 
@@ -54,14 +62,7 @@ module EffectiveTestBot
             rescue_from ActionController::UnpermittedParameters do |exception|
               assign_test_bot_unpermitted_params_header(exception)
             end
-
-            # This isn't working properly. TODO: Fix this
-            # rescue_from StandardError do |exception|
-            #   assign_test_bot_exceptions_header(exception)
-            #   render status: 500, text: "<html><body><h1>Uncaught Exception</h1><p>#{exception.message}</p><p>#{exception.backtrace.first(20).join('<br>')}</p></body></html>"
-            # end
           end
-
         end
       end
     end

data/lib/effective_test_bot/middleware.rb

@@ -0,0 +1,40 @@
+# Watch for any rails server exceptions and write the stacktrace to ./tmp/test_bot/exception.txt
+# This file is checked for by assert_no_exceptions
+
+module EffectiveTestBot
+  class Middleware
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      begin
+        @app.call(env)
+      rescue Exception => exception
+        begin
+          save(exception)
+        rescue => e
+          puts "TestBotError: An error occurred while attempting to save a rails server exception: #{e.message}"
+        end
+
+        raise exception
+      end
+    end
+
+    def save(exception)
+      lines = [exception.message] + exception.backtrace.first(8)
+
+      dir = File.join(Dir.pwd, 'tmp', 'test_bot')
+      file = File.join(dir, 'exception.txt')
+
+      Dir.mkdir(dir) unless File.exists?(dir)
+      File.delete(file) if File.exists?(file)
+
+      File.open(file, 'w') do |file|
+        file.write "================== Start server exception ==================\n"
+        lines.each { |line| file.write(line); file.write("\n") }
+        file.write "=================== End server exception ===================\n"
+      end
+    end
+  end
+end

data/lib/effective_test_bot/version.rb

@@ -1,3 +1,3 @@
 module EffectiveTestBot
-  VERSION = '0.4.13'.freeze
+  VERSION = '0.4.14'.freeze
 end

data/lib/generators/templates/test_helper.rb

@@ -30,7 +30,7 @@ class ActionDispatch::IntegrationTest
   # def setup # Called before every test
   # end
 
-  # def teardown # Called after every single test
+  # def teardown # Called after every test
   # end
 
   def after_teardown # I reset sessions here so capybara-screenshot can still make screenshots when tests fail

data/test/concerns/test_botable/devise_dsl.rb

@@ -35,6 +35,8 @@ module TestBotable
     def devise_action_test(test, options = {})
       options[:email] ||= "unique-#{Time.zone.now.to_i}@example.com"
       options[:password] ||= '!Password123'
+      options[:username] ||= 'unique-username'
+      options[:login] ||= 'unique-login'
       options[:user] ||= User.new
 
       begin

data/test/concerns/test_botable/wizard_dsl.rb

@@ -20,7 +20,12 @@ module TestBotable
     module ClassMethods
 
       def wizard_test(from_path, to_path, user, options = {})
-        options[:current_test] = options.delete(:label) || "#{from_path} to #{to_path}"
+        if to_path.present?
+          options[:current_test] = options.delete(:label) || "#{from_path} to #{to_path}"
+        else
+          options[:current_test] = options.delete(:label) || "#{from_path}"
+        end
+
         return if EffectiveTestBot.skip?(options[:current_test])
 
         method_name = test_bot_method_name('wizard_test', options[:current_test])

data/test/support/effective_test_bot_assertions.rb

@@ -1,14 +1,20 @@
 module EffectiveTestBotAssertions
+  def assert_page_content(content, message = "(page_content) Expected page content :content: to be present")
+    assert page.has_text?(content, wait: 0), message.sub(':content:', content)
+  end
+
+  def assert_no_page_content(content, message = "(page_content) Expected page content :content: to be blank")
+    assert page.has_no_text?(content, wait: 0), message.sub(':content:', content)
+  end
+
   def assert_signed_in(message = nil)
-    visit new_user_session_path
-    assert_content I18n.t('devise.failure.already_authenticated') #, message || '(signed_in) Expected devise already_authenticated content to be present'
-    assert page.has_no_selector?('form#new_user'), message || '(signed_in) Expected new_user form to be blank'
+    visit(root_path) if page.current_path.blank?
+    assert assigns['current_user'].present?, message || 'Expected @current_user to be present when signed in'
   end
 
   def assert_signed_out(message = nil)
-    visit new_user_session_path
-    refute_content I18n.t('devise.failure.already_authenticated') #, message || '(signed_out) Expected devise already_authenticated content to be blank'
-    assert page.has_selector?('form#new_user'), message || '(signed_out) Expected new_user form to be present'
+    visit(root_path) if page.current_path.blank? || assigns['current_user'].present?
+    assert assigns['current_user'].blank?, message || 'Expected @current_user to be blank when signed out'
   end
 
   def assert_capybara_can_execute_javascript(message = "Expected capybara-webkit page.evaluate_script() to be successful")
@@ -32,8 +38,6 @@ module EffectiveTestBotAssertions
   end
 
   def assert_page_title(title = :any, message = '(page_title) Expected page title to be present')
-    return if was_download? # If this was a download, it correctly won't have a page title
-
     if title.present? && title != :any
       assert_title(title) # Capybara TitleQuery, match this text
     else
@@ -43,7 +47,7 @@ module EffectiveTestBotAssertions
   end
 
   def assert_form(selector, message = "(form) Expected visible form with selector :selector: to be present")
-    assert all(selector).present?, message.sub(':selector', selector)
+    assert all(selector).present?, message.sub(':selector:', selector)
   end
 
   def assert_submit_input(message = "(submit_input) Expected one or more visible input[type='submit'] to be present")
@@ -56,7 +60,7 @@ module EffectiveTestBotAssertions
 
   def assert_current_path(path, message = '(current_path) Expected current_path to be :path:')
     path = public_send(path) if path.kind_of?(Symbol)
-    assert_equal path, page.current_path, message.sub(':path', path.to_s)
+    assert_equal path, page.current_path, message.sub(':path:', path.to_s)
   end
 
   # assert_redirect '/about'
@@ -78,8 +82,15 @@ module EffectiveTestBotAssertions
     assert_equal [], unpermitted_params, message
   end
 
-  def assert_no_exceptions(message = nil)
-    assert exceptions.blank?, message || "(no_exceptions) Unexpected exception:\n#{exceptions.join("\n")}\n========== End of rails server exception ==========\n"
+  def assert_no_exceptions(message = "(no_exceptions) Unexpected rails server exception:\n:exception:")
+    # this file is created by EffectiveTestBot::Middleware when an exception is encountered in the rails app
+    file = File.join(Dir.pwd, 'tmp', 'test_bot', 'exception.txt')
+    return unless File.exists?(file)
+
+    exception = File.read(file)
+    File.delete(file)
+
+    assert false, message.sub(':exception:', exception)
   end
 
   # This must be run after submit_form()

data/test/support/effective_test_bot_form_filler.rb

@@ -65,6 +65,7 @@ module EffectiveTestBotFormFiller
       case [field.tag_name, field['type']].compact.join('_')
       when 'input_text', 'input_email', 'input_password', 'input_tel', 'input_number', 'input_checkbox', 'input_radio', 'textarea'
         field.set(value_for_field(field, fills))
+        close_effective_date_time_picker(field) if field['class'].to_s.include?('effective_date')
       when 'select'
         if EffectiveTestBot.tour_mode_extreme? && field['class'].to_s.include?('select2') # select2
           page.execute_script("try { $('select##{field['id']}').select2('open'); } catch(e) {};")
@@ -165,6 +166,8 @@ module EffectiveTestBotFormFiller
         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
+      elsif attribute.include?('slug')
+        Faker::Lorem.words(3).join(' ').parameterize
       else
         Faker::Lorem.words(3).join(' ').capitalize
       end
@@ -319,6 +322,10 @@ module EffectiveTestBotFormFiller
     end
   end
 
+  def close_effective_date_time_picker(field)
+    page.execute_script("try { $('input##{field['id']}').data('DateTimePicker').hide(); } catch(e) {};")
+  end
+
   private
 
   def fill_value_for_field(fills, attributes)

data/test/support/effective_test_bot_form_helper.rb

@@ -47,6 +47,7 @@ module EffectiveTestBotFormHelper
 
       begin
         field.set('');
+        close_effective_date_time_picker(field) if field['class'].to_s.include?('effective_date')
         save_test_bot_screenshot if EffectiveTestBot.tour_mode_extreme?
       rescue => e; end
     end

data/test/support/effective_test_bot_login_helper.rb

@@ -2,13 +2,15 @@
 
 module EffectiveTestBotLoginHelper
   def as_user(user)
-    sign_in(user); yield; logout
+    sign_in(user); yield; sign_out
   end
 
-  def sign_in(user) # Warden::Test::Helpers
+  # This is currently hardcoded to use the warden login_as test helper
+  def sign_in(user)
     user.kind_of?(String) ? login_as(User.find_by_email!(user)) : login_as(user)
   end
 
+  # This is currently hardcoded to use the warden logout test helper
   def sign_out
     logout
   end
@@ -17,9 +19,11 @@ module EffectiveTestBotLoginHelper
     visit new_user_session_path
 
     email = (user_or_email.respond_to?(:email) ? user_or_email.email : user_or_email)
+    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
-      fill_form(email: email, password: password)
+      fill_form(email: email, password: password, username: username, login: login)
       submit_novalidate_form
     end
   end

data/test/support/effective_test_bot_test_helper.rb

@@ -29,6 +29,11 @@ module EffectiveTestBotTestHelper
     end
   end
 
+  # Calls capybara within do .. end if selector is present and bool is true
+  def within_if(selector, bool = true, &block)
+    (selector.present? && bool) ? within(selector) { yield } : yield
+  end
+
   def click_first(label)
     click_link(label, match: :first)
   end

data/test/test_bot/integration/application_test.rb

@@ -52,12 +52,17 @@ module TestBot
               end
             end
 
+          # Wizard Test
+          elsif is_wicked_controller?(route)
+            first_step_path = "/#{controller}/#{controller_instance(route).wizard_steps.first}"
+            wizard_test(first_step_path, nil, User.first)
+
           # Member Test
           elsif route.verb.to_s.include?('GET') && route.path.required_names == ['id']
             member_test(controller, action, User.first)
 
           # Page Test
-          elsif route.verb.to_s.include?('GET') && route.name.present?
+          elsif route.verb.to_s.include?('GET') && route.name.present? && Array(route.path.required_names).blank? # This could eventually be removed to supported nested routes
             page_test("#{route.name}_path".to_sym, User.first, route: route, label: "#{route.name}_path")
 
           else
@@ -67,22 +72,47 @@ module TestBot
         end
       end
 
-      private
+      protected
 
       def is_crud_controller?(route)
         return false unless CRUD_ACTIONS.include?(route.defaults[:action])
-        return false unless route.defaults[:controller].present? && route.app.respond_to?(:controller)
 
-        begin
-          controller_klass = route.app.controller(route.defaults)
-          controller_instance = controller_klass.new()
+        controller = controller_instance(route)
+        controller.respond_to?(:new) && controller.respond_to?(:create)
+      end
 
-          # Is this a CRUD capable controller?
-          controller_instance.respond_to?(:new) && controller_instance.respond_to?(:create)
-        rescue => e
-          false
-        end
+      # https://github.com/schneems/wicked/
+      def is_wicked_controller?(route)
+        return false unless defined?(Wicked::Wizard)
+
+        controller = controller_instance(route)
+        return false unless controller.kind_of?(Wicked::Wizard)
+
+        # So this is a Wicked::Wizard controller, we have to trick it into running an action to make the steps available
+        controller.params = {}
+        (controller.run_callbacks(:process_action) rescue false)
+
+        controller.wizard_steps.present?
+      end
+
+      private
+
+      def controller_instance(route)
+        return :none unless route.defaults[:controller] && route.defaults[:action]
+
+        @_controller_instances ||= {}
+        @_controller_instances[route.defaults[:controller]] ||= build_controller_instance(route)
+      end
+
+      def build_controller_instance(route)
+        # Find the correct route.app that links to the controller
+        # If there is a routing constraint, we have to traverse the route.app linked list to find the route with a controller
+        route_app = route
+        route_app = route_app.app while (route_app.respond_to?(:app) && route_app != route_app.app)
+
+        return :none unless route_app.respond_to?(:controller)
 
+        (route_app.controller(route.defaults).new() rescue :none)
       end
 
     end

data/test/test_bot/integration/environment_test.rb

@@ -5,16 +5,13 @@ module TestBot
     @@original_users_count = User.count
     let(:original_users_count) { @@original_users_count }
 
-    let(:email) { 'unique@testbot.com' }
-    let(:password) { '!Password123' }
-    let(:username) { 'test_bot_user' }
-
     def self.test_order
       :alpha
     end
 
-    test '01: seeds and fixtures loaded' do
-      assert_environment_normal
+    test '01: can visit root_path' do
+      visit root_path
+      assert_page_status
     end
 
     test '02: all fixtures and seeds valid' do
@@ -29,86 +26,41 @@ module TestBot
       end
     end
 
-    # I could remove this if sign_in checks for and creates a user with devise or not
-    test '03: at least one user is seeded' do
-      assert (User.count > 0), 'please create at least 1 seed or fixture user for effective_test_bot to function'
+    test '03: at least one user is present' do
+      assert (User.count > 0), 'please fixture or seed at least 1 user for effective_test_bot to function'
     end
 
-    test '04: activerecord can create a user' do
-      create_user!
+    test '04: activerecord can save a resource' do
+      User.new(email: 'unique@testbot.com', password: '!Password123', password_confirmation: '!Password123').save(validate: false)
       assert_equal (original_users_count + 1), User.count
     end
 
-    test '05: test database has reset' do
-      assert_environment_normal
-    end
-
-    test '06: capybara can execute javascript' do
-      visit root_path
-      assert_capybara_can_execute_javascript
-    end
-
-    test '07: jquery is present' do
-      visit root_path
-      assert_jquery_present
+    test '05: database has rolled back' do
+      assert_equal original_users_count, User.count, 'the activerecord resource created in a previous test is still present'
     end
 
-    test '08: rails jquery_ujs is present' do
-      visit root_path
-      assert_jquery_ujs_present
-    end
-
-    test '09: capybara can sign up a user' do
-      user = sign_up()
-      assert user.kind_of?(User), "expected to create a new user after submitting sign up form at #{new_user_registration_path}"
-
-      assert_equal (original_users_count + 1), User.count
+    test '06: capybara can sign_in' do
+      sign_in(User.first)
       assert_signed_in
     end
 
-    test '10: database and session have reset' do
+    test '07: capybara session has reset' do
       assert_signed_out
-      assert_environment_normal
     end
 
-    test '11: capybara can login_as via warden test helper' do
-      create_user!
-      sign_in(email)
-      assert_signed_in
-    end
-
-    test '12: database and session have reset' do
-      assert_signed_out
-      assert_environment_normal
-    end
-
-    test '13: capybara can sign in manually' do
-      create_user!
-      sign_in_manually(email, password)
-      assert_signed_in
-    end
-
-    test '14: database and session have reset' do
-      assert_signed_out
-      assert_environment_normal
+    test '08: capybara can execute javascript' do
+      visit root_path
+      assert_capybara_can_execute_javascript
     end
 
-    private
-
-    # This is all about seeing if the cookies, session, and database are rolling back properly in between tests
-    def assert_environment_normal
+    test '09: jquery is present' do
       visit root_path
-      assert_page_status
-      assert_equal original_users_count, User.count, 'Expected User.count to be back to original'
-      assert assigns[:current_user].blank?, 'Expected current_user to be blank'
+      assert_jquery_present
     end
 
-    def create_user!
-      user = User.new(email: email, password: password, password_confirmation: password)
-      user.username = username if user.respond_to?('username=')
-      user.login = username if user.respond_to?('login=')
-
-      user.valid? ? user.save : user.save(validate: false)
+    test '10: rails jquery_ujs is present' do
+      visit root_path
+      assert_jquery_ujs_present
     end
 
   end

data/test/test_botable/base_test.rb

@@ -10,7 +10,7 @@ module BaseTest
     assert_no_exceptions unless test_bot_skip?(:exceptions)
     assert_page_status unless test_bot_skip?(:page_status)
     assert_no_js_errors unless test_bot_skip?(:no_js_errors)
-    assert_page_title unless test_bot_skip?(:page_title)
+    assert_page_title unless (test_bot_skip?(:page_title) || all('head').blank? || was_download?)
   end
 
   private
@@ -44,9 +44,9 @@ module BaseTest
 
       visit(new_resource_path)
 
-      assert_form "form#new_#{resource_name}", "TestBotError: Failed to find form#new_#{resource_name}. #{hint}"
+      assert_form("form#new_#{resource_name}", "TestBotError: Failed to find form#new_#{resource_name}. #{hint}") unless test_bot_skip?(:form)
 
-      within("form#new_#{resource_name}") do
+      within_if("form#new_#{resource_name}", !test_bot_skip?(:form)) do
         fill_form(resource_attributes)
 
         assert_submit_input "TestBotError: Failed to find a visible input[type='submit'] on #{page.current_path}. #{hint}"

data/test/test_botable/crud_test.rb

@@ -37,15 +37,12 @@ module CrudTest
     assert_page_normal
     assert_assigns(resource_name) # unskippable
 
-    # 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}"
+    assert_form("form#new_#{resource_name}") unless test_bot_skip?(:form)
 
-    within(form_selector) do
+    within_if("form#new_#{resource_name}", !test_bot_skip?(:form)) do
       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_invalid_test
@@ -53,7 +50,9 @@ module CrudTest
 
     before = { count: resource_class.count }
 
-    within("form#new_#{resource_name}") do
+    assert_form("form#new_#{resource_name}") unless test_bot_skip?(:form)
+
+    within_if("form#new_#{resource_name}", !test_bot_skip?(:form)) do
       without_screenshots { clear_form }
       submit_novalidate_form
     end
@@ -79,7 +78,9 @@ module CrudTest
 
     before = { count: resource_class.count, path: page.current_path }
 
-    within("form#new_#{resource_name}") do
+    assert_form("form#new_#{resource_name}") unless test_bot_skip?(:form)
+
+    within_if("form#new_#{resource_name}", !test_bot_skip?(:form)) do
       fill_form(resource_attributes)
       submit_form
     end
@@ -117,12 +118,9 @@ module CrudTest
 
     assert_page_normal
     assert_assigns(resource_name) # unskippable
+    assert_form("form#edit_#{resource_name}_#{resource.id}") unless test_bot_skip?(:form)
 
-    # 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
+    within_if("form#edit_#{resource_name}_#{resource.id}", !test_bot_skip?(:form)) do
       assert_submit_input unless test_bot_skip?(:submit_input)
       assert_jquery_ujs_disable_with unless test_bot_skip?(:jquery_ujs_disable_with)
     end
@@ -136,14 +134,16 @@ module CrudTest
 
     before = { count: resource_class.count, updated_at: (resource.updated_at rescue nil) }
 
-    within("form#edit_#{resource_name}_#{resource.id}") do
+    assert_form("form#edit_#{resource_name}_#{resource.id}") unless test_bot_skip?(:form)
+
+    within_if("form#edit_#{resource_name}_#{resource.id}", !test_bot_skip?(:form)) do
       clear_form
       submit_novalidate_form
     end
 
     save_test_bot_screenshot
 
-    resource = resource_class.find(resource.id)
+    resource = resource_class.where(id: resource.id).first
 
     after = { count: resource_class.count, updated_at: (resource.updated_at rescue nil) }
 
@@ -169,14 +169,16 @@ module CrudTest
 
     before = { count: resource_class.count, updated_at: (resource.updated_at rescue nil) }
 
-    within("form#edit_#{resource_name}_#{resource.id}") do
+    assert_form("form#edit_#{resource_name}_#{resource.id}") unless test_bot_skip?(:form)
+
+    within_if("form#edit_#{resource_name}_#{resource.id}", !test_bot_skip?(:form)) do
       fill_form(resource_attributes)
       submit_form
     end
 
     save_test_bot_screenshot
 
-    resource = resource_class.find(resource.id)
+    resource = resource_class.where(id: resource.id).first
 
     after = { count: resource_class.count, updated_at: (resource.updated_at rescue nil) }
 
@@ -224,10 +226,10 @@ module CrudTest
       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) }
+    after = { count: resource_class.count, archived: (resource_class.where(id: resource.id).first.try(:archived) rescue nil) }
 
     if resource.respond_to?(:archived)
-      assert_equal(true, after[:archived], "Expected #{resource_class}.archived? to be true")
+      assert_equal(true, after[:archived], "Expected @#{resource_name}.archived? to be true")
     else
       assert_equal before[:count]-1, after[:count], "Expected: #{resource_class}.count to decrement by 1"
     end

data/test/test_botable/devise_test.rb

@@ -7,33 +7,43 @@ module DeviseTest
   def test_bot_devise_sign_up_test
     visit new_user_registration_path
 
-    within('form#new_user') do
+    assert_form('form#new_user') unless test_bot_skip?(:form)
+
+    within_if('form#new_user', !test_bot_skip?(:form)) do
       fill_form(email: email, password: password, password_confirmation: password)
       submit_form
     end
 
     assert_page_normal
 
-    assert_content I18n.t('devise.registrations.signed_up')
-    assert User.find_by_email(email).present?
-    assert_assigns :current_user
+    assert_signed_in('Expected @current_user to be present after sign up')
+    assert User.where(email: email).first.present?, "Expected user to be present after submitting sign up form at #{new_user_registration_path}"
+    assert_page_content(I18n.t('devise.registrations.signed_up')) unless test_bot_skip?(:page_content)
   end
 
   def test_bot_devise_sign_in_valid_test
-    User.new(email: email, password: password, password_confirmation: password).save(validate: false)
+    user = User.new(email: email, password: password, password_confirmation: password)
+    user.username = username if user.respond_to?(:username)
+    user.login = login if user.respond_to?(:login)
+    user.save(validate: false)
 
     visit new_user_session_path
 
-    within('form#new_user') do
-      fill_form(email: email, password: password)
+    assert_form('form#new_user') unless test_bot_skip?(:form)
+
+    within_if('form#new_user', !test_bot_skip?(:form)) do
+      fill_form(email: email, password: password, username: username, login: login)
       submit_form
     end
 
     assert_page_normal
 
-    assert_content I18n.t('devise.sessions.signed_in')
-    assert_equal 1, User.find_by_email(email).sign_in_count
-    assert_assigns :current_user
+    assert_signed_in
+    assert_page_content(I18n.t('devise.sessions.signed_in')) unless test_bot_skip?(:page_content)
+
+    if User.new().respond_to?(:sign_in_count)
+      assert_equal 1, User.where(email: email).first.try(:sign_in_count), "Expected user sign in count to be incremented after signing in"
+    end
   end
 
   def test_bot_devise_sign_in_invalid_test
@@ -41,15 +51,17 @@ module DeviseTest
 
     visit new_user_session_path
 
-    within('form#new_user') do
+    assert_form('form#new_user') unless test_bot_skip?(:form)
+
+    within_if('form#new_user', !test_bot_skip?(:form)) do
       fill_form(email: email, password: 'not-correct-password')
       submit_form
     end
 
     assert_page_normal
 
-    assert_content I18n.t('devise.failure.invalid', authentication_keys: Devise.authentication_keys.join(', '))
-    assert assigns[:current_user].blank?
+    assert_signed_out
+    assert_page_content(I18n.t('devise.failure.invalid', authentication_keys: Devise.authentication_keys.join(', '))) unless test_bot_skip?(:page_content)
   end
 
 end

data/test/test_botable/wizard_test.rb

@@ -26,9 +26,10 @@ module WizardTest
         # Keep going till there's no more submit buttons
         break if all("input[type='submit']").blank?
       end
-
     end
 
+    save_test_bot_screenshot
+
     assert_current_path(to_path) if to_path.present?
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_test_bot
 version: !ruby/object:Gem::Version
-  version: 0.4.13
+  version: 0.4.14
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-05 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -214,11 +214,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
+- README.md
+- Rakefile
 - app/helpers/effective_test_bot_controller_helper.rb
 - lib/effective_profile_bot/heap_analyzer.rb
+- lib/effective_test_bot.rb
 - lib/effective_test_bot/engine.rb
+- lib/effective_test_bot/middleware.rb
 - lib/effective_test_bot/version.rb
-- lib/effective_test_bot.rb
 - lib/generators/effective_test_bot/install_generator.rb
 - lib/generators/templates/effective_test_bot.rb
 - lib/generators/templates/test_helper.rb
@@ -247,9 +251,6 @@ files:
 - test/test_botable/page_test.rb
 - test/test_botable/redirect_test.rb
 - test/test_botable/wizard_test.rb
-- MIT-LICENSE
-- Rakefile
-- README.md
 homepage: https://github.com/code-and-effect/effective_test_bot
 licenses:
 - MIT
@@ -270,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A shared library of rails model & capybara-based feature tests that should