effective_test_bot 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: faf3170be69a804110713bd4fffd0d2802841fa2
-  data.tar.gz: 3ac29840a0b524fad45cded4d7d81c3bcb56bee4
+  metadata.gz: 836a02fd7342588742c06d55d4f64d06382b5db5
+  data.tar.gz: a136f7e711237d2038d86b64273f9d2d54248183
 SHA512:
-  metadata.gz: e1bc8fe65d07f530b193e9498e5d3537944d09903727f0407cc7c93bccfeed52addaa1383a56faea2bc005be2429b1e5d856da74da5bc7209e5949425dfb3d7c
-  data.tar.gz: 4174f5a21a7cfa52081df5d86de979b48cfe1a44fe167a5974b84653cb64f4bcd24555d0787b269336f33540376684bafc566937c46df7186e91b6a6c48c607e
+  metadata.gz: a81518d383fabca6561057e0262c33487f8c377b90f7b0569ec18da26cae2910546a983af8afe2614dfa217a7206c95f2e952539d77a0345086a172226483364
+  data.tar.gz: fe6980136e37b6881cf11ea673340d69af4d3c766c6932e0adb40b8c7db87a978bf27488371d768cfff4b5dada780972a5447241bf3f2c2d320dec4a95166e8e

data/README.md

@@ -35,14 +35,69 @@ Run the test suite with:
 
 ```ruby
 bundle exec rake test:bot
+bundle exec rake test:bot:environment
 ```
 
 You should now see multiple -- hopefully passing -- tests that you didn't write!
 
+## TODO
 
+Document this gem
+
+Minitest:
 
 rake test TEST=test/integration/clinic_assets_test.rb
 
+TestBot:
+
+rake test:bot TEST=posts
+rake test:bot TEST=posts#index
+rake test:bot TEST=
+
+Excepts will always work and be accounted for in test:bot
+Definign TEST= works with test names 'documents#new' or 'documents' or 'something_path' but not with 'flash' assertions
+
+
+    # config.except = [
+    #   'flash',
+    #   'users#show',
+    #   'users#create_invalid' => ['path', 'page_title'],
+    #   'users#create_invalid' => 'no_unpermitted_params',
+    #   'report_total_allocation_index_path'
+    #   'documents#destroy flash'
+    # ]
+
+
+require 'test_helper'
+
+class UsersTest < ActionDispatch::IntegrationTest
+  # The Create and Update action return to /members/12345 instead of /users/12345 when failing validation
+  # This is a side effect of working in the same namespace as devise
+  crud_test(User, User.find_by_email('admin@agilestyle.com'), except: :show, skip: {create_invalid: :path, update_invalid: :path})
+end
+
+require 'test_helper'
+
+class SettingTest < ActionDispatch::IntegrationTest
+  crud_test(Setting, User.first, only: [:new, :create])
+end
+
+require 'test_helper'
+
+class PhysiciansTest < ActionDispatch::IntegrationTest
+  page_test(:user_settings_path, User.first)
+  page_test(:user_settings_path, User.first)
+  page_test(:user_settings_path, User.first)
+  crud_test(Physician, User.first, except: :show)
+  crud_test('physicians', User.first, except: :show)
+
+  test 'another action' do
+    crud_action_test(:new, Physician, User.first)
+  end
+end
+
+
+
 
 ## Fixtures
 

data/app/helpers/effective_test_bot_controller_helper.rb

@@ -25,10 +25,15 @@ module EffectiveTestBotControllerHelper
   end
 
   # We get here if ApplicationController raised a ActionController::UnpermittedParameters error
-  def assign_test_bot_unpermitted_params_headers(exception)
+  def assign_test_bot_unpermitted_params_header(exception)
     if exception.kind_of?(ActionController::UnpermittedParameters)
       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

@@ -9,17 +9,33 @@ module EffectiveTestBot
     yield self
   end
 
+  # Test could be something like "crud_test", "crud_test (documents#new)", "documents", documents#new"
+  # Assertion will be page_title, or flash
+
   def self.skip?(test, assertion = nil)
-    value = [test.to_s.presence, assertion.to_s.presence].compact.join(' ')
-    return false if value.blank?
-
-    if onlies.present?
-      onlies.find { |only| value.start_with?(only) }.blank? # Let partial matches work
-    elsif excepts.present?
-      excepts.find { |except| except == value }.present?
-    else
-      false
+    return false if (test || assertion).blank?
+
+    test = test.to_s
+    assertion = assertion.to_s
+
+    # If I get passed a method_name, "crud_test: (posts#create_invalid)" extract the inner test name from it
+    # I dunno why this is needed really, but it might help someone one day.
+    if test.include?('_test: (')  # This is how the BaseDsl test_bot_method_name formats the test names.
+      left = test.index('(') || -1
+      right = test.rindex(')') || (test.length+1)
+      test = test[(left+1)..(right-1)]
     end
+
+    value = "#{test} #{assertion}".strip # This is the format config.excepts is flattened into
+
+    # Excepts are defined in the app's config/initializers/effective_test_bot.rb file
+    return true if excepts.any? { |except| [test, assertion, value].include?(except) }
+
+    # Onlies are defined in the same config file, or on the command like rake test:bot TEST=posts#new
+    # It doesn't match just 'flash' or 'page_title' assertions
+    return true if onlies.present? && onlies.find { |only| test.start_with?(only) }.blank?
+
+    false # Don't skip this test
   end
 
   private

data/lib/effective_test_bot/engine.rb

@@ -17,6 +17,7 @@ module EffectiveTestBot
         # 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
@@ -25,6 +26,7 @@ module EffectiveTestBot
         # 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
@@ -48,7 +50,12 @@ module EffectiveTestBot
 
           ApplicationController.instance_exec do
             rescue_from ActionController::UnpermittedParameters do |exception|
-              assign_test_bot_unpermitted_params_headers(exception)
+              assign_test_bot_unpermitted_params_header(exception)
+            end
+
+            rescue_from Exception do |exception|  # Not sure if I should rescue Exception or StandardError
+              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
 

data/lib/effective_test_bot/version.rb

@@ -1,3 +1,3 @@
 module EffectiveTestBot
-  VERSION = '0.4.2'.freeze
+  VERSION = '0.4.3'.freeze
 end

data/lib/generators/templates/test_helper.rb

@@ -36,7 +36,6 @@ class ActionDispatch::IntegrationTest
   def after_teardown # I reset sessions here so capybara-screenshot can still make screenshots when tests fail
     super(); Capybara.reset_sessions!
   end
-
 end
 
 
@@ -53,14 +52,19 @@ Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
 ### That gets run just once before the whole test suite loads
 
 # So the very first thing I do is set up a consistent database
-Rake::Task['db:schema:load'].invoke
+silence_stream(STDOUT) do
+  Rake::Task['db:schema:load'].invoke
+end
+
 ActiveRecord::Migration.maintain_test_schema!
 
 # or the following 3:
 
-#Rake::Task['db:drop'].invoke
-#Rake::Task['db:create'].invoke
-#Rake::Task['db:migrate'].invoke
+# silence_stream(STDOUT) do
+#   Rake::Task['db:drop'].invoke
+#   Rake::Task['db:create'].invoke
+#   Rake::Task['db:migrate'].invoke
+# end
 
 Rake::Task['db:fixtures:load'].invoke # There's just no way to get the seeds first, as this has to delete everything
 Rake::Task['db:seed'].invoke

data/lib/tasks/effective_test_bot_tasks.rake

@@ -6,6 +6,8 @@ require 'rails/test_unit/sub_test_task'
 # rake test:bot TEST=documents#new,documents#show
 # rake test:bot TEST=documents#new path,documents#show,documents#update_valid no_unpermitted_params
 
+# rake test:bot:environment
+
 namespace :test do
   desc 'Runs Effective Test Bot'
   task :bot do
@@ -17,9 +19,21 @@ namespace :test do
     Rake::Task["test:effective_test_bot"].invoke
   end
 
+  namespace :bot do
+    desc 'Runs Effective Test Bot environment test'
+    task :environment do
+      Rake::Task["test:effective_test_bot_environment"].invoke
+    end
+  end
+
   Rails::TestTask.new('effective_test_bot' => 'test:prepare') do |t|
     t.libs << 'test'
-    t.test_files = FileList["#{File.dirname(__FILE__)}/../../test/test_bot/**/*_test.rb"]
+    t.test_files = FileList["#{File.dirname(__FILE__)}/../../test/test_bot/integration/application_test.rb"]
+  end
+
+  Rails::TestTask.new('effective_test_bot_environment' => 'test:prepare') do |t|
+    t.libs << 'test'
+    t.test_files = FileList["#{File.dirname(__FILE__)}/../../test/test_bot/integration/environment_test.rb"]
   end
 
   desc 'loads test/fixtures/seeds.rb'

data/test/concerns/test_botable/base_dsl.rb

@@ -3,7 +3,7 @@ module TestBotable
     extend ActiveSupport::Concern
 
     module ClassMethods
-      TEST_BOT_TEST_PREFIXES = ['crud_test', 'member_test', 'page_test', 'redirect_test', 'wizard_test']
+      TEST_BOT_TEST_PREFIXES = ['crud_test', 'devise_test', 'member_test', 'page_test', 'redirect_test', 'wizard_test']
 
       # Parses and validates lots of options
       # This is a big manual merge wherein we translate some DSL methods into one consistent Hash here
@@ -80,10 +80,10 @@ module TestBotable
           options[:resource_class] = resource_class
           options[:resource_name] = resource_class.name.underscore
           options[:resource_attributes] = resource_attributes
-
-          options[:normalized] = true
         end
 
+        options[:normalized] = true
+
         options
       end
 
@@ -106,6 +106,7 @@ module TestBotable
           @num_defined_test_bot_tests[test_family] = (@num_defined_test_bot_tests[test_family] || 0) + 1
         end
 
+        # If we change the format here, also update effective_test_bot.skip? method
         if current_test.present?
           "#{test_family}: (#{current_test})"
         elsif number_of_tests > 1

data/test/concerns/test_botable/crud_dsl.rb

@@ -46,6 +46,7 @@ module TestBotable
           ].compact.join('/') + '#' + test.to_s
 
           method_name = test_bot_method_name('crud_test', label || options_for_method[:current_test])
+          next if EffectiveTestBot.skip?(label || options_for_method[:current_test])
 
           define_method(method_name) { crud_action_test(test, resource, user, options_for_method) }
         end
@@ -83,7 +84,7 @@ module TestBotable
       begin
         assign_test_bot_lets!(options.reverse_merge!(user: user, resource: resource))
       rescue => e
-        raise "Error: #{e.message}.  Expected usage: crud_action_test(:new, Post || Post.new, User.first, options_hash)"
+        raise "Error: #{e.message}.  Expected usage: crud_action_test(:new, Post || Post.new, User.first)"
       end
 
       self.send("test_bot_#{test}_test")

data/test/concerns/test_botable/devise_dsl.rb

@@ -0,0 +1,50 @@
+# This DSL gives a class level and an instance level way of calling specific test suite
+#
+# class DeviseTest < ActionDispatch::IntegrationTest
+#   devise_test()
+#
+#   test 'a one-off action' do
+#     devise_action_test(:sign_up)
+#     devise_action_test(:sign_in_valid)
+#     devise_action_test(:sign_in_invalid)
+#   end
+# end
+
+module TestBotable
+  module DeviseDsl
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+
+      def devise_test(options = {})
+        label = options.delete(:label).presence
+
+        [:sign_up, :sign_in_valid, :sign_in_invalid].each do |test|
+          options[:current_test] = label || test
+
+          method_name = test_bot_method_name('devise_test', options[:current_test])
+          next if EffectiveTestBot.skip?(options[:current_test])
+
+          define_method(method_name) { devise_action_test(test, options) }
+        end
+      end
+
+    end
+
+    # Instance Methods - Call me from within a test
+    def devise_action_test(test, options = {})
+      options[:email] ||= "unique-#{Time.zone.now.to_i}@example.com"
+      options[:password] ||= '!Password123'
+      options[:user] ||= User.new
+
+      begin
+        assign_test_bot_lets!(options)
+      rescue => e
+        raise "Error: #{e.message}.  Expected usage: devise_action_test(:sign_up)"
+      end
+
+      self.send("test_bot_devise_#{test}_test")
+    end
+
+  end
+end

data/test/concerns/test_botable/member_dsl.rb

@@ -18,8 +18,10 @@ module TestBotable
     module ClassMethods
 
       def member_test(controller, action, user, obj_to_param = nil, options = {})
-        options[:current_test] = "#{controller}##{action}"
-        method_name = test_bot_method_name('member_test', options.delete(:label) || options[:current_test])
+        options[:current_test] = options.delete(:label) || "#{controller}##{action}"
+
+        method_name = test_bot_method_name('member_test', options[:current_test])
+        return if EffectiveTestBot.skip?(options[:current_test])
 
         define_method(method_name) { member_action_test(controller, action, user, obj_to_param, options) }
       end

data/test/concerns/test_botable/page_dsl.rb

@@ -16,8 +16,10 @@ module TestBotable
     module ClassMethods
 
       def page_test(path, user, options = {})
-        options[:current_test] = path.to_s
-        method_name = test_bot_method_name('page_test', options.delete(:label) || options[:current_test])
+        options[:current_test] = options.delete(:label) || path.to_s
+
+        method_name = test_bot_method_name('page_test', options[:current_test])
+        return if EffectiveTestBot.skip?(options[:current_test])
 
         define_method(method_name) { page_action_test(path, user, options) }
       end
@@ -29,7 +31,7 @@ module TestBotable
       begin
         assign_test_bot_lets!(options.reverse_merge!(user: user, page_path: path))
       rescue => e
-        raise "Error: #{e.message}.  Expected usage: crud_action_test(:new, Post || Post.new, User.first, options_hash)"
+        raise "Error: #{e.message}.  Expected usage: page_action_test(root_path, User.first)"
       end
 
       self.send(:test_bot_page_test)

data/test/concerns/test_botable/redirect_dsl.rb

@@ -15,8 +15,10 @@ module TestBotable
     module ClassMethods
 
       def redirect_test(from_path, to_path, user, options = {})
-        options[:current_test] = "#{from_path} to #{to_path}"
-        method_name = test_bot_method_name('redirect_test', options.delete(:label) || options[:current_test])
+        options[:current_test] = options.delete(:label) || "#{from_path} to #{to_path}"
+
+        method_name = test_bot_method_name('redirect_test', options[:current_test])
+        return if EffectiveTestBot.skip?(options[:current_test])
 
         define_method(method_name) { redirect_action_test(from_path, to_path, user, options) }
       end

data/test/concerns/test_botable/wizard_dsl.rb

@@ -18,8 +18,10 @@ module TestBotable
     module ClassMethods
 
       def wizard_test(from_path, to_path, user, options = {})
-        options[:current_test] = "#{from_path} to #{to_path}"
-        method_name = test_bot_method_name('wizard_test', options.delete(:label) || options[:current_test])
+        options[:current_test] = options.delete(:label) || "#{from_path} to #{to_path}"
+
+        method_name = test_bot_method_name('wizard_test', options[:current_test])
+        return if EffectiveTestBot.skip?(options[:current_test])
 
         define_method(method_name) { wizard_action_test(from_path, to_path, user, options) }
       end

data/test/support/effective_test_bot_assertions.rb

@@ -12,6 +12,8 @@ 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
@@ -39,16 +41,19 @@ module EffectiveTestBotAssertions
     end
   end
 
-
   def assert_no_js_errors(message = nil)
     errors = page.driver.error_messages
-    assert_equal 0, errors.size, message || "(no_js_errors) Unexpected javascript error: #{errors.join(', ')}"
+    assert errors.blank?, message || "(no_js_errors) Unexpected javascript error:\n#{errors.first.to_s}"
   end
 
   def assert_no_unpermitted_params(message = '(no_unpermitted_params) Expected no unpermitted params')
     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 Exception ==========\n"
+  end
+
   # assert_flash
   # assert_flash :success
   # assert_flash :error, 'there was a specific error'

data/test/support/effective_test_bot_form_helper.rb

@@ -10,6 +10,7 @@ module EffectiveTestBotFormHelper
 
     # Support for the cocoon gem
     all('a.add_fields[data-association-insertion-template]').each do |cocoon_add_field|
+      next unless cocoon_add_field.visible?
       [1,2].sample.times { cocoon_add_field.click() }
     end
 
@@ -65,7 +66,10 @@ module EffectiveTestBotFormHelper
     when 'input_email'
       Faker::Internet.email
     when 'input_number'
-      Faker::Number.number(4)
+      min = (Float(field['min']) rescue 1)
+      max = (Float(field['max']) rescue 1000)
+      number = Random.new.rand(min..max)
+      number.kind_of?(Float) ? number.round(2) : number
     when 'input_password'
       @test_bot_password ||= Faker::Internet.password  # Use the same password throughout a single test. Allows passwords and password_confirmations to match.
     when 'input_tel'
@@ -75,9 +79,16 @@ module EffectiveTestBotFormHelper
       classes = field['class'].to_s.split(' ')
 
       if classes.include?('date') # Let's assume this is a date input.
-        Faker::Date.backward(365).strftime('%y-%m-%d')
+        Faker::Date.backward(365).strftime('%Y-%m-%d')
       elsif classes.include?('datetime')
-        Faker::Date.backward(365).strftime('%y-%m-%d %H:%m')
+        Faker::Date.backward(365).strftime('%Y-%m-%d %H:%m')
+      elsif classes.include?('price')
+        4.times.map { DIGITS.sample }.join('') + '.00'
+      elsif classes.include?('numeric')
+        min = (Float(field['min']) rescue 1)
+        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')
         Faker::Name.first_name
       elsif attributes.last.to_s.include?('last_name')

data/test/support/effective_test_bot_test_helper.rb

@@ -17,12 +17,23 @@ module EffectiveTestBotTestHelper
     @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 [])
+
+    @visit_delete_page = session
   end
 
   def was_redirect?(from_path, to_path = nil)
     from_path != (to_path || page.current_path)
   end
 
+  def was_download?(filename = nil)
+    if filename.present?
+      page.response_headers['Content-Disposition'].to_s.include?('filename=') &&
+      page.response_headers['Content-Disposition'].to_s.include?(filename)
+    else
+      page.response_headers['Content-Disposition'].to_s.include?('filename=')
+    end
+  end
+
   # EffectiveTestBot includes an after_filter on ApplicationController to set an http header
   # that encodes the flash message, and some of the assigns
   def flash
@@ -36,4 +47,9 @@ module EffectiveTestBotTestHelper
   def unpermitted_params
     @unpermitted_params ||= (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 [])
+  end
+
 end

data/test/test_bot/integration/application_test.rb

@@ -13,10 +13,6 @@ module TestBot
         routes = Rails.application.routes.routes.to_a
         seen_actions = Hash.new([])  # {posts: ['new', 'edit'], events: ['new', 'edit', 'show']}
 
-        #Rails.application.routes.recognize_path('/your/path/here')
-        #Rails.application.routes.recognize_path('/admin/jobs/3/unarchive')
-        # => {:action=>"unarchive", :controller=>"admin/jobs", :id=>"3"}
-
         routes.each_with_index do |route, index|
           controller = route.defaults[:controller]
           action = route.defaults[:action]
@@ -24,10 +20,10 @@ module TestBot
           # Devise Test
           if (controller || '').include?('devise')
             next if seen_actions['devise'].present?
-
-            puts 'define devise test!!'
             seen_actions['devise'] = true # So we don't repeat it
 
+            devise_test()
+
           # Redirect Test
           elsif route.app.kind_of?(ActionDispatch::Routing::PathRedirect) && route.path.required_names.blank?
             path = route.path.spec.to_s

data/test/test_bot/integration/{minitest_test.rb → environment_test.rb}

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 module TestBot
-  class MinitestTest < ActionDispatch::IntegrationTest
+  class EnvironmentTest < ActionDispatch::IntegrationTest
     @@original_users_count = User.count
     let(:original_users_count) { @@original_users_count }
 

data/test/test_botable/base_test.rb

@@ -6,6 +6,7 @@ module BaseTest
 
   def assert_page_normal(message = nil)
     unless test_bot_skip?(:normal)
+      assert_no_exceptions unless test_bot_skip?(:exceptions)
       assert_page_status unless test_bot_skip?(:page_status)
       assert_page_title unless test_bot_skip?(:page_title)
       assert_no_js_errors unless test_bot_skip?(:no_js_errors)
@@ -21,11 +22,12 @@ module BaseTest
   # if you use the action_test_ instance methods, current_test is nil, and test skips won't apply
   # Any global assertion skips will tho
   def test_bot_skip?(assertion = nil)
-    # Skip the whole test
+    # Skip the whole test 'documents#new'
     # this will put SKIP into the minitest output
     skip if (defined?(current_test) && EffectiveTestBot.skip?(current_test))
 
-    # Check if the individual assertion should be skipped
+    # Skip just this assertion sub test 'flash'
+    # this will not print anything to the minitest output
     EffectiveTestBot.skip?((current_test if defined?(current_test)), assertion)
   end
 

data/test/test_botable/crud_test.rb

@@ -5,7 +5,6 @@ module CrudTest
   protected
 
   def test_bot_new_test
-    test_bot_skip?
     sign_in(user) and visit(new_resource_path)
 
     assert_page_normal
@@ -21,7 +20,6 @@ module CrudTest
   end
 
   def test_bot_create_valid_test
-    test_bot_skip?
     sign_in(user) and visit(new_resource_path)
 
     before = { count: resource_class.count, path: page.current_path }
@@ -46,7 +44,6 @@ module CrudTest
   end
 
   def test_bot_create_invalid_test
-    test_bot_skip?
     sign_in(user) and visit(new_resource_path)
 
     before = { count: resource_class.count }
@@ -58,11 +55,11 @@ module CrudTest
 
     after = { count: resource_class.count }
 
-    assert_equal before[:count], after[:count], "Expected #{resource_class}.count to be unchanged"
-    assert_page_title(:any, '(page_title) Expected page title to be present after failed validation') unless test_bot_skip?(:page_title)
+    assert_page_normal
 
-    assert_no_js_errors unless test_bot_skip?(:no_js_errors)
+    assert_equal before[:count], after[:count], "Expected #{resource_class}.count to be unchanged"
     assert_flash(:danger) unless test_bot_skip?(:flash)
+
     assert_assigns(resource_name) unless test_bot_skip?(:assigns)
     assert_assigns_errors(resource_name) unless test_bot_skip?(:assigns_errors)
 
@@ -70,7 +67,6 @@ module CrudTest
   end
 
   def test_bot_edit_test
-    test_bot_skip?
     sign_in(user) and (resource = find_or_create_resource!)
 
     visit(edit_resource_path(resource))
@@ -88,7 +84,6 @@ module CrudTest
   end
 
   def test_bot_update_valid_test
-    test_bot_skip?
     sign_in(user) and (resource = find_or_create_resource!)
 
     visit(edit_resource_path(resource))
@@ -103,8 +98,7 @@ module CrudTest
 
     after = { count: resource_class.count, updated_at: (resource.updated_at rescue nil) }
 
-    assert_no_js_errors unless test_bot_skip?(:no_js_errors)
-    assert_no_unpermitted_params unless test_bot_skip?(:unpermitted_params)
+    assert_page_normal
 
     assert_equal before[:count], after[:count], "Expected #{resource_class}.count to be unchanged"
     refute_equal(before[:updated_at], after[:updated_at], "(updated_at_changed) Expected @#{resource_name}.updated_at to have changed") if (resource.respond_to?(:updated_at) && !test_bot_skip?(:updated_at_changed))
@@ -118,7 +112,6 @@ module CrudTest
   end
 
   def test_bot_update_invalid_test
-    test_bot_skip?
     sign_in(user) and (resource = find_or_create_resource!)
 
     visit(edit_resource_path(resource))
@@ -133,12 +126,13 @@ module CrudTest
 
     after = { count: resource_class.count, updated_at: (resource.updated_at rescue nil) }
 
-    assert_no_js_errors unless test_bot_skip?(:no_js_errors)
+    assert_page_normal
+
     assert_equal before[:count], after[:count], "Expected: #{resource_class}.count to be unchanged"
     assert_equal(before[:updated_at], after[:updated_at], "Expected @#{resource_name}.updated_at to be unchanged") if resource.respond_to?(:updated_at)
-    assert_page_title(:any, '(page_title) Expected page title to be present after failed validation') unless test_bot_skip?(:page_title)
 
     assert_flash(:danger) unless test_bot_skip?(:flash)
+
     assert_assigns(resource_name) unless test_bot_skip?(:assigns)
     assert_assigns_errors(resource_name) unless test_bot_skip?(:assigns_errors)
 
@@ -146,7 +140,6 @@ module CrudTest
   end
 
   def test_bot_index_test
-    test_bot_skip?
     sign_in(user) and (resource = (find_or_create_resource! rescue nil))
 
     visit resources_path
@@ -160,7 +153,6 @@ module CrudTest
   end
 
   def test_bot_show_test
-    test_bot_skip?
     sign_in(user) and (resource = find_or_create_resource!)
 
     visit resource_path(resource)
@@ -170,7 +162,6 @@ module CrudTest
   end
 
   def test_bot_destroy_test
-    test_bot_skip?
     sign_in(user) and (resource = find_or_create_resource!)
 
     before = { count: resource_class.count, archived: (resource.archived rescue nil) }
@@ -179,6 +170,12 @@ module CrudTest
 
     after = { count: resource_class.count, archived: (resource_class.find(resource.id).archived rescue nil) }
 
+    # 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)
+
     assert_flash(:success) unless test_bot_skip?(:flash)
 
     if resource.respond_to?(:archived)

data/test/test_botable/devise_test.rb

@@ -0,0 +1,55 @@
+# All the methods in this file should not be called from the outside world
+# See the DSL files in concerns/test_botable/ for how to call these tests
+
+module DeviseTest
+  protected
+
+  def test_bot_devise_sign_up_test
+    visit new_user_registration_path
+
+    within('form#new_user') 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
+  end
+
+  def test_bot_devise_sign_in_valid_test
+    User.new(email: email, password: password, password_confirmation: password).save(validate: false)
+
+    visit new_user_session_path
+
+    within('form#new_user') do
+      fill_form(email: email, password: password)
+      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
+  end
+
+  def test_bot_devise_sign_in_invalid_test
+    User.new(email: email, password: password, password_confirmation: password).save(validate: false)
+
+    visit new_user_session_path
+
+    within('form#new_user') 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?
+  end
+
+end

data/test/test_botable/member_test.rb

@@ -5,7 +5,6 @@ module MemberTest
   protected
 
   def test_bot_member_test
-    test_bot_skip?
     sign_in(user) and (resource = find_or_create_resource!)
 
     path = url_for(controller: controller, action: action, id: resource.id, only_path: true)
@@ -13,7 +12,6 @@ module MemberTest
     visit(path)
 
     assert_page_normal
-    assert_flash unless test_bot_skip?(:flash)
     assert_assigns(resource_name) unless (was_redirect?(path) || test_bot_skip?(:assigns))
   end
 

data/test/test_botable/page_test.rb

@@ -5,8 +5,6 @@ module PageTest
   protected
 
   def test_bot_page_test
-    test_bot_skip?
-
     sign_in(user)
 
     if page_path.kind_of?(Symbol)

data/test/test_botable/redirect_test.rb

@@ -5,8 +5,6 @@ module RedirectTest
   protected
 
   def test_bot_redirect_test
-    test_bot_skip?
-
     sign_in(user) and visit(from_path)
 
     assert_redirect(from_path, to_path)

data/test/test_botable/wizard_test.rb

@@ -5,8 +5,6 @@ module WizardTest
   protected
 
   def test_bot_wizard_test
-    test_bot_skip?
-
     sign_in(user) and visit(from_path)
 
     0.upto(50) do |index|   # Can only test wizards 51 steps long

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_test_bot
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-24 00:00:00.000000000 Z
+date: 2015-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -213,6 +213,7 @@ files:
 - lib/tasks/effective_test_bot_tasks.rake
 - test/concerns/test_botable/base_dsl.rb
 - test/concerns/test_botable/crud_dsl.rb
+- test/concerns/test_botable/devise_dsl.rb
 - test/concerns/test_botable/member_dsl.rb
 - test/concerns/test_botable/page_dsl.rb
 - test/concerns/test_botable/redirect_dsl.rb
@@ -223,11 +224,10 @@ files:
 - test/support/effective_test_bot_login_helper.rb
 - test/support/effective_test_bot_test_helper.rb
 - test/test_bot/integration/application_test.rb
-- test/test_bot/integration/devise_test.rb
-- test/test_bot/integration/minitest_test.rb
-- test/test_bot/models/user_test.rb
+- test/test_bot/integration/environment_test.rb
 - test/test_botable/base_test.rb
 - test/test_botable/crud_test.rb
+- test/test_botable/devise_test.rb
 - test/test_botable/member_test.rb
 - test/test_botable/page_test.rb
 - test/test_botable/redirect_test.rb

data/test/test_bot/integration/devise_test.rb

@@ -1,54 +0,0 @@
-require 'test_helper'
-
-if defined?(Devise) && defined?(User)
-  module TestBot
-    class DeviseTest < ActionDispatch::IntegrationTest
-      let(:email) { 'unique@testbot.com'}
-      let(:password) { '!Password123' }
-      let(:create_user!) { User.new(email: email, password: password, password_confirmation: password).save(validate: false) }
-
-      test 'sign up' do
-        visit new_user_registration_path
-
-        within('form#new_user') do
-          fill_form(email: email, password: password, password_confirmation: password)
-          submit_form
-        end
-
-        assert_equal page.status_code, 200
-        assert_content I18n.t('devise.registrations.signed_up')
-        assert User.find_by_email(email).present?
-        assert_assigns :current_user
-      end
-
-      test 'sign in' do
-        create_user!
-        visit new_user_session_path
-
-        within('form#new_user') do
-          fill_form(email: email, password: password)
-          submit_form
-        end
-
-        assert_equal 200, page.status_code
-        assert_content I18n.t('devise.sessions.signed_in')
-        assert_equal 1, User.find_by_email(email).sign_in_count
-        assert_assigns :current_user
-      end
-
-      test 'invalid sign in' do
-        create_user!
-        visit new_user_session_path
-
-        within('form#new_user') do
-          fill_form(email: email, password: 'not-correct-password')
-          submit_form
-        end
-
-        assert_equal 200, page.status_code
-        assert_content I18n.t('devise.failure.invalid', authentication_keys: Devise.authentication_keys.join(', '))
-        assert assigns[:current_user].blank?
-      end
-    end
-  end
-end

data/test/test_bot/models/user_test.rb

@@ -1,22 +0,0 @@
-require 'test_helper'
-
-if defined?(Devise) && defined?(User)
-  module TestBot
-    class UserTest < ActiveSupport::TestCase
-      let(:user) { User.new() }
-
-      # These are mostly here as an example of using shoulda
-      # I don't find that I use the gem, but I see it's value
-      should validate_presence_of(:email)
-      should validate_presence_of(:password)
-      should validate_presence_of(:encrypted_password)
-
-      test "user invalid when password and confirmation mismatch" do
-        user.password = '123456789'
-        user.password_confirmation = '987654321'
-
-        refute user.valid?, 'user should be invalid with mismatched passwords'
-      end
-    end
-  end
-end