effective_test_bot 0.5.9 → 0.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30419a4b996dc2b0178006e804e1a3ecec0857a2
-  data.tar.gz: e17ad442c55d3986c0eddbfb626d3f7972ab6398
+  metadata.gz: d50c75e5319b53cbe8c1e2961a84e9869d33618f
+  data.tar.gz: 54f357016f40060d93dbda71279950c48949f1a4
 SHA512:
-  metadata.gz: c5588d9ffb6a02b72ea17b719d8af563fd235f694120445e559b5b651a7912686ef3d7d28d8cd108140054e931c1389e8a783a2c55b5b4aaef7ffb7f19aefdde
-  data.tar.gz: 40a99d2ff37fa7f84f2d01434968330d3a8ff915b76bb4402a229f6dfac44762aaa396b9a1a7d4fe50ac6336f0f79ab5442584d93e2ad1cae6cf4eb895f133b9
+  metadata.gz: 5dbbb1b750b858eeec2e2a44e28ba0b64865200e7d2712d65ba97fc656dc634f56c46166034580755b39bf7c556e7eb1ddc07c3367abd95046549f126d71c249
+  data.tar.gz: 41ae170c048e453be9192bf90a307ea5b55e972341d968800775a5db3bcbd604449efe14504ea44678c5e05096c41d3b31869f3d503802d1dac7f53c2aeb1ab6

data/lib/effective_test_bot.rb

@@ -14,6 +14,7 @@ module EffectiveTestBot
   mattr_accessor :animated_gif_delay
   mattr_accessor :animated_gif_background_color
   mattr_accessor :backtrace_lines
+  mattr_accessor :silence_skipped_routes
 
   mattr_accessor :passed_tests # This isn't a config variable.
 

data/lib/effective_test_bot/engine.rb

@@ -56,8 +56,13 @@ module EffectiveTestBot
         if Rails.env.test?
           ActionController::Base.send :include, ::EffectiveTestBotControllerHelper
 
-          ActionController::Base.send :before_filter, :expires_now # Prevent 304 Not Modified caching
-          ActionController::Base.send :after_filter, :assign_test_bot_http_headers
+          if ActionController::Base.respond_to?(:before_action)
+            ActionController::Base.send :before_action, :expires_now # Prevent 304 Not Modified caching
+            ActionController::Base.send :after_action, :assign_test_bot_http_headers
+          else
+            ActionController::Base.send :before_filter, :expires_now # Prevent 304 Not Modified caching
+            ActionController::Base.send :after_filter, :assign_test_bot_http_headers
+          end
 
           ApplicationController.instance_exec do
             rescue_from ActionController::UnpermittedParameters do |exception|

data/lib/effective_test_bot/version.rb

@@ -1,3 +1,3 @@
 module EffectiveTestBot
-  VERSION = '0.5.9'.freeze
+  VERSION = '0.5.10'.freeze
 end

data/lib/generators/templates/effective_test_bot.rb

@@ -17,6 +17,9 @@ if Rails.env.test?
     #   'posts', 'events#index'
     # ]
 
+    # Silence skipped routes
+    config.silence_skipped_routes = false
+
     # Exits immediately if there is a test failure
     config.fail_fast = false
 

data/lib/generators/templates/test_helper.rb

@@ -1,5 +1,5 @@
 ENV['RAILS_ENV'] = 'test'
-require File.expand_path("../../config/environment", __FILE__)
+require File.expand_path('../../config/environment', __FILE__)
 require 'rails/test_help'
 require 'minitest/rails'
 require 'minitest/rails/capybara'
@@ -13,6 +13,8 @@ require 'capybara/webkit'
 require 'capybara-screenshot/minitest'
 require 'capybara/slow_finder_errors'
 
+require 'database_cleaner'
+
 class ActiveSupport::TestCase
   # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
   fixtures :all
@@ -26,8 +28,15 @@ class ActionDispatch::IntegrationTest
   include Capybara::Screenshot::MiniTestPlugin
   include Warden::Test::Helpers if defined?(Devise)
 
-  def after_teardown # Some apps seem to need this to correctly reset the test_06:_capybara_can_sign_in
-    super(); Capybara.reset_sessions!
+  def after_setup
+    super()
+    DatabaseCleaner.start
+  end
+
+  def after_teardown
+    super()
+    DatabaseCleaner.clean
+    Capybara.reset_sessions!  # Some apps seem to need this to correctly reset the test_06:_capybara_can_sign_in
   end
 end
 
@@ -44,16 +53,19 @@ Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
 Rails.backtrace_cleaner.remove_silencers!
 Rails.backtrace_cleaner.add_silencer { |line| line =~ /minitest/ }
 
+###############################################
 ### Effective Test Bot specific stuff below ###
+###############################################
 
-# So the very first thing I do is set up a consistent database
-silence_stream(STDOUT) do
-  Rake::Task['db:schema:load'].invoke
-end
+# So the very first thing we do is consistently reset the database.
+# This can be done with Snippet 1 or Snippet 2.
+# Snippet 1 is faster, and will usually work.  Snippet 2 should always work.
 
+# Snippet 1:
+silence_stream(STDOUT) { Rake::Task['db:schema:load'].invoke }
 ActiveRecord::Migration.maintain_test_schema!
 
-# or the following 3:
+# Snippet 2:
 
 # silence_stream(STDOUT) do
 #   Rake::Task['db:drop'].invoke
@@ -61,6 +73,7 @@ ActiveRecord::Migration.maintain_test_schema!
 #   Rake::Task['db:migrate'].invoke
 # end
 
+# Now we populate our test data:
 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
 Rake::Task['test:load_fixture_seeds'].invoke # This is included by effective_test_bot.  It just runs the app's test/fixtures/seeds.rb if it exists
@@ -69,14 +82,23 @@ if EffectiveTestBot.fail_fast?
   require 'minitest/fail_fast'
 end
 
-# Make all database transactions use the same thread, otherwise signing up in capybara won't get rolled back
-# This must be run after the Rake::Tasks above
-class ActiveRecord::Base
-  mattr_accessor :shared_connection
-  @@shared_connection = nil
+# "Connection not rolling back" snippets
+# These are some snippets that the internet has collected to fix test threading issues.
+# They are unneeded with effective_test_bot.  On my machine. But I leave them here as a reference.
+# Try one or both if you are having issues passing rake test:bot:environment
 
-  def self.connection
-    @@shared_connection || retrieve_connection
-  end
-end
-ActiveRecord::Base.shared_connection = ActiveRecord::Base.connection
+# class ActiveRecord::Base
+#   mattr_accessor :shared_connection
+#   @@shared_connection = nil
+
+#   def self.connection
+#     @@shared_connection || retrieve_connection
+#   end
+# end
+# ActiveRecord::Base.shared_connection = ActiveRecord::Base.connection
+
+# ActiveRecord::ConnectionAdapters::ConnectionPool.class_eval do
+#   def current_connection_id
+#     Thread.main.object_id
+#   end
+# end

data/test/test_bot/integration/application_test.rb

@@ -21,14 +21,14 @@ module TestBot
           action = route.defaults[:action]
 
           # Devise Test
-          if (controller || '').include?('devise')
+          if is_devise_controller?(route)
             next if seen_actions['devise'].present?
             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?
+          elsif is_redirect?(route)
             path = route.path.spec.to_s
             route.path.optional_names.each { |name| path.sub!("(.:#{name})", '') } # Removes (.:format) from path
             redirect_test(from: path, to: route.app.path([], nil))
@@ -54,19 +54,23 @@ module TestBot
 
           # Wizard Test
           elsif is_wicked_controller?(route)
-            first_step_path = "/#{controller}/#{controller_instance(route).wizard_steps.first}"
-            wizard_test(from: first_step_path)
+            next if seen_actions[controller].present?
+            seen_actions[controller] = true # So we don't repeat it
+
+            wizard_test(from: "#{route.name}_path".to_sym, step: controller_instance(route).wizard_steps.first)
 
           # Member Test
-          elsif route.verb.to_s.include?('GET') && route.path.required_names == ['id']
+          elsif is_member?(route)
             member_test(controller: controller, action: action)
 
           # Page Test
-          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
+          elsif is_page?(route)
             page_test(path: "#{route.name}_path".to_sym, route: route, label: "#{route.name}_path")
 
           else
-            #puts "skipping #{route.name}_path | #{route.path.spec} | #{route.verb} | #{route.defaults[:controller]} | #{route.defaults[:action]}"
+            unless EffectiveTestBot.silence_skipped_routes
+              puts "skipping #{route.name}_path | #{route.path.spec} | #{route.verb} | #{route.defaults[:controller]} | #{route.defaults[:action]}"
+            end
 
           end # / Routes
         end
@@ -74,6 +78,17 @@ module TestBot
 
       protected
 
+      def is_devise_controller?(route)
+        return true if (route.defaults[:controller] || '').include?('devise')
+
+        controller = controller_instance(route)
+        controller.respond_to?(:devise_controller?) && controller.devise_controller?
+      end
+
+      def is_redirect?(route)
+        route.app.kind_of?(ActionDispatch::Routing::PathRedirect) && route.path.required_names.blank?
+      end
+
       def is_crud_controller?(route)
         return false unless CRUD_ACTIONS.include?(route.defaults[:action])
 
@@ -85,6 +100,9 @@ module TestBot
       def is_wicked_controller?(route)
         return false unless defined?(Wicked::Wizard)
 
+        # This might be a wickeds controller, but it's a nested one, so we can't handle it anyway
+        return false unless route.path.required_names == ['id']
+
         controller = controller_instance(route)
         return false unless controller.kind_of?(Wicked::Wizard)
 
@@ -95,6 +113,14 @@ module TestBot
         controller.wizard_steps.present?
       end
 
+      def is_member?(route)
+        route.verb.to_s.include?('GET') && route.path.required_names == ['id']
+      end
+
+      def is_page?(route)
+        route.verb.to_s.include?('GET') && route.name.present? && Array(route.path.required_names).blank? # This could eventually be removed to supported nested routes
+      end
+
       private
 
       def controller_instance(route)

data/test/test_botable/base_test.rb

@@ -93,18 +93,22 @@ module BaseTest
   end
 
   def resources_path # index, create
-    polymorphic_path([*controller_namespace, resource_class])
+    path = polymorphic_path([*controller_namespace, resource_class]) rescue nil
+    path || polymorphic_path([*controller_namespace.try(:singularize), resource_class])
   end
 
   def resource_path(resource) # show, update, destroy
-    polymorphic_path([*controller_namespace, resource])
+    path = polymorphic_path([*controller_namespace, resource]) rescue nil
+    path || polymorphic_path([*controller_namespace.try(:singularize), resource])
   end
 
   def new_resource_path # new
-    new_polymorphic_path([*controller_namespace, resource_class])
+    path = new_polymorphic_path([*controller_namespace, resource_class]) rescue nil
+    path || new_polymorphic_path([*controller_namespace.try(:singularize), resource_class])
   end
 
   def edit_resource_path(resource) # edit
-    edit_polymorphic_path([*controller_namespace, resource])
+    path = edit_polymorphic_path([*controller_namespace, resource]) rescue nil
+    path || edit_polymorphic_path([*controller_namespace.try(:singularize), resource])
   end
 end

data/test/test_botable/wizard_test.rb

@@ -5,7 +5,13 @@ module WizardTest
   protected
 
   def test_bot_wizard_test(&block)
-    sign_in(user) and visit(from)
+    sign_in(user)
+
+    if from.kind_of?(Symbol) && defined?(step)
+      visit(public_send(from, id: step))
+    else
+      visit(from)
+    end
 
     0.upto(50) do |index|   # Can only test wizards 51 steps long
       assert_page_normal

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_test_bot
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.5.10
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-18 00:00:00.000000000 Z
+date: 2016-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -285,7 +299,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A shared library of rails model & capybara-based feature tests that should