effective_test_bot 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 348dcab0f742b0fc3c398a29924e03373b1c8899
-  data.tar.gz: 3f4657ab5beea8f59ea201da177df6dbc9ff2d8c
+  metadata.gz: a39eb4dbe99bb9e9e190dcdea42b98217e899fbb
+  data.tar.gz: f3de18d8e670326b43977a17eaec8abc1bc9afc1
 SHA512:
-  metadata.gz: 8d5fb505be70bf496edeae75bb397835db2385148a5b69cc87b903ec4af64e8c54e581afcf7c96af25e46d6e95b2c8be6dec9b7a729e937c43555c0633f9d7bc
-  data.tar.gz: d54670db3513736069612105476f68b93c8e0a39cfcc36751a3804bb8f152dea7bdde713caa8b81e324b67b305ffa13beff64ba7622589df54b41cf5ee643649
+  metadata.gz: 6602fcc1c63846384499ff4c3d20109dc113f20ed8e3d18f804e7a960da289dd15ab3700f7de6c45ea186963af1397627d7062abba896008bc1a00882e0259b4
+  data.tar.gz: 430925ce013e377568e84a0e12295694adb9fe13355f7cb8129c0191f2c1b0db44f302af128d412c70f3310af2af111db8530cbf394e9cd40b8f535f8ff2da77

data/config/effective_test_bot.rb

@@ -18,6 +18,11 @@ if Rails.env.test?
     # Silence skipped routes
     config.silence_skipped_routes = false
 
+    # Set the current user on a per test basis. You must have at least 1 user seeded.
+    # test is a String as per the except, only and TEST= test names
+    # proc = { |test| user = User.first; puts "#{test} #{user}"; user }
+    config.user = proc { |test| User.first }
+
     # Exits immediately if there is a test failure
     config.fail_fast = false
 

data/lib/effective_test_bot.rb

@@ -1,9 +1,11 @@
+require 'effective_resources'
 require 'effective_test_bot/engine'
 require 'effective_test_bot/dsl'
 require 'effective_test_bot/middleware'
 require 'effective_test_bot/version'
 
 module EffectiveTestBot
+  mattr_accessor :user
   mattr_accessor :except
   mattr_accessor :only
   mattr_accessor :fail_fast

data/lib/effective_test_bot/version.rb

@@ -1,3 +1,3 @@
 module EffectiveTestBot
-  VERSION = '0.6.2'.freeze
+  VERSION = '0.6.3'.freeze
 end

data/test/concerns/test_botable/base_dsl.rb

@@ -5,10 +5,6 @@ module TestBotable
     module ClassMethods
       TEST_BOT_TEST_PREFIXES = ['crud_test', 'devise_test', 'member_test', 'page_test', 'redirect_test', 'wizard_test']
 
-      def _test_bot_user
-        @test_bot_user
-      end
-
       # Parses and validates lots of options
       # This is a big manual merge wherein we translate some DSL methods into one consistent Hash here
       # The output is what gets sent to each test and defined as lets
@@ -28,8 +24,6 @@ module TestBotable
 
       def normalize_test_bot_options!(options)
         raise 'expected options to be a Hash' unless options.kind_of?(Hash)
-        raise 'expected key :user to be a User' unless (options[:user].kind_of?(User) || options[:user] == false)
-        #raise 'expected key :current_test to be a String' unless options[:current_test].kind_of?(String)
 
         # Controller stuff
         options[:controller_namespace] ||= options[:namespace]
@@ -123,8 +117,20 @@ module TestBotable
 
     # Instance Methods
 
-    def _test_bot_user
-      @test_bot_user
+    def test_bot_user(test_name)
+      return @test_bot_user if @test_bot_user
+
+      unless EffectiveTestBot.user.kind_of?(Proc)
+        raise 'expected EffectiveTestBot.user to be a proc. Set config.user = Proc.new { |test| User.first }'
+      end
+
+      user = EffectiveTestBot.user.call(test_name)
+
+      unless user
+        raise "no user returned for #{test_name}. Please make sure the /config/initializers/effective_test_bot.rb config.user proc returns a user for this test."
+      end
+
+      user
     end
 
     # Using reverse_merge! in the dsl action_tests makes sure that the

data/test/concerns/test_botable/crud_dsl.rb

@@ -18,7 +18,7 @@ module TestBotable
 
       # All this does is define a 'test_bot' method for each required action on this class
       # So that MiniTest will see the test functions and run them
-      def crud_test(resource:, user: _test_bot_user(), label: nil, skip: {}, only: nil, except: nil, **options)
+      def crud_test(resource:, user: nil, label: nil, skip: {}, only: nil, except: nil, **options)
         # This skips paramaters is different than the initializer skips, which affect just the rake task
 
         # These are specificially for the DSL
@@ -28,7 +28,7 @@ module TestBotable
         current_crud_tests = crud_tests_to_define(only, except)
 
         begin
-          normalize_test_bot_options!(options.merge!(resource: resource, user: user, current_crud_tests: current_crud_tests))
+          normalize_test_bot_options!(options.merge!(resource: resource, current_crud_tests: current_crud_tests))
         rescue => e
           raise "Error: #{e.message}.  Expected usage: crud_test(resource: (Post || Post.new), user: User.first, only: [:new, :create], skip: {create_invalid: [:path]})"
         end
@@ -78,7 +78,9 @@ module TestBotable
     #
     # If obj is a Hash {:resource => ...} just skip over parsing options
     # And assume it's already been done (by the ClassMethod crud_test)
-    def crud_action_test(test:, resource:, user: _test_bot_user(), **options)
+    def crud_action_test(test:, resource:, user: nil, **options)
+      user ||= test_bot_user(options[:current_test])
+
       begin
         assign_test_bot_lets!(options.reverse_merge!(resource: resource, user: user))
       rescue => e

data/test/concerns/test_botable/member_dsl.rb

@@ -16,7 +16,7 @@ module TestBotable
     extend ActiveSupport::Concern
 
     module ClassMethods
-      def member_test(controller:, action:, user: _test_bot_user(), member: nil, label: nil, **options)
+      def member_test(controller:, action:, user: nil, member: nil, label: nil, **options)
         options[:current_test] = label || "#{controller}##{action}"
         return if EffectiveTestBot.skip?(options[:current_test])
 
@@ -28,7 +28,9 @@ module TestBotable
     end
 
     # Instance Methods - Call me from within a test
-    def member_action_test(controller:, action:, user: _test_bot_user(), member:, **options)
+    def member_action_test(controller:, action:, user: nil, member:, **options)
+      user ||= test_bot_user(options[:current_test])
+
       begin
         assign_test_bot_lets!(options.reverse_merge!(resource: controller, action: action, user: user, member: member))
       rescue => e

data/test/concerns/test_botable/page_dsl.rb

@@ -15,7 +15,7 @@ module TestBotable
 
     module ClassMethods
 
-      def page_test(path:, user: _test_bot_user(), label: nil, **options)
+      def page_test(path:, user: nil, label: nil, **options)
         options[:current_test] = label || path.to_s
         return if EffectiveTestBot.skip?(options[:current_test])
 
@@ -27,7 +27,9 @@ module TestBotable
     end
 
     # Instance Methods - Call me from within a test
-    def page_action_test(path:, user: _test_bot_user(), **options)
+    def page_action_test(path:, user: nil, **options)
+      user ||= test_bot_user(options[:current_test])
+
       begin
         assign_test_bot_lets!(options.reverse_merge!(user: user, page_path: path))
       rescue => e

data/test/concerns/test_botable/redirect_dsl.rb

@@ -14,7 +14,7 @@ module TestBotable
 
     module ClassMethods
 
-      def redirect_test(from:, to:, user: _test_bot_user(), label: nil, **options)
+      def redirect_test(from:, to:, user: nil, label: nil, **options)
         options[:current_test] = label || "#{from} to #{to}"
         return if EffectiveTestBot.skip?(options[:current_test])
 
@@ -25,7 +25,9 @@ module TestBotable
     end
 
     # Instance Methods - Call me from within a test
-    def redirect_action_test(from:, to:, user: _test_bot_user(), **options)
+    def redirect_action_test(from:, to:, user: nil, **options)
+      user ||= test_bot_user(options[:current_test])
+
       begin
         assign_test_bot_lets!(options.reverse_merge!(from: from, to: to, user: user))
       rescue => e

data/test/concerns/test_botable/wizard_dsl.rb

@@ -19,7 +19,7 @@ module TestBotable
 
     module ClassMethods
 
-      def wizard_test(from:, to: nil, user: _test_bot_user(), label: nil, **options)
+      def wizard_test(from:, to: nil, user: nil, label: nil, **options)
         options[:current_test] = label || (to.present? ? "#{from} to #{to}" : from.to_s)
         return if EffectiveTestBot.skip?(options[:current_test])
 
@@ -31,7 +31,9 @@ module TestBotable
     end
 
     # Instance Methods - Call me from within a test
-    def wizard_action_test(from:, to: nil, user: _test_bot_user(), **options)
+    def wizard_action_test(from:, to: nil, user: nil, **options)
+      user ||= test_bot_user(options[:current_test])
+
       begin
         assign_test_bot_lets!(options.reverse_merge!(from: from, to: to, user: user))
       rescue => e

data/test/support/effective_test_bot_form_filler.rb

@@ -72,6 +72,8 @@ 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', 'input_url', 'input_color'
         field.set(value_for_field(field, fills))
+
+        close_effective_date_time_picker(field) if field['class'].to_s.include?('effective_date')
       when 'textarea'
         value = value_for_field(field, fills)
         ckeditor_text_area?(field) ? fill_ckeditor_text_area(field, value) : field.set(value)

data/test/test_bot/integration/application_test.rb

@@ -11,8 +11,6 @@ module TestBot
 
       # Go through every route, and run an appropriate test suite on it
       def initialize_tests
-        @test_bot_user = User.first
-
         routes = Rails.application.routes.routes.to_a
         seen_actions = Hash.new([])  # {posts: ['new', 'edit'], events: ['new', 'edit', 'show']}
 
@@ -127,20 +125,8 @@ module TestBot
         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)
+        @_controller_instances[route.defaults[:controller]] ||= (Effective::Resource.new(route).controller_klass.new() rescue :none)
       end
-
     end
 
     initialize_tests

data/test/test_botable/crud_test.rb

@@ -48,7 +48,7 @@ module CrudTest
   def test_bot_create_invalid_test
     sign_in(user) and visit(new_resource_path)
 
-    before = { count: resource_class.count }
+    before = { count: (resource_class.count if resource_class.respond_to?(:count)) }
 
     assert_form("form#new_#{resource_name}") unless test_bot_skip?(:form)
 
@@ -59,14 +59,14 @@ module CrudTest
 
     save_test_bot_screenshot
 
-    after = { count: resource_class.count }
+    after = { count: (resource_class.count if resource_class.respond_to?(:count)) }
 
     assert_page_normal
 
     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"
+    assert_equal(before[:count], after[:count], "Expected #{resource_class}.count to be unchanged") if resource_class.respond_to?(:count)
     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)
@@ -76,7 +76,7 @@ module CrudTest
     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 if resource_class.respond_to?(:count)), path: page.current_path }
 
     assert_form("form#new_#{resource_name}") unless test_bot_skip?(:form)
 
@@ -87,7 +87,7 @@ module CrudTest
 
     save_test_bot_screenshot
 
-    after = { count: resource_class.count, path: page.current_path }
+    after = { count: (resource_class.count if resource_class.respond_to?(:count)), path: page.current_path }
 
     assert_page_normal
     assert_no_flash_errors unless test_bot_skip?(:no_flash_errors)
@@ -97,7 +97,7 @@ module CrudTest
     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)
 
-    refute_equal before[:count], after[:count], "Expected fill_form to create a #{resource_class} object"
+    refute_equal(before[:count], after[:count], "Expected fill_form to create a #{resource_class} object") if resource_class.respond_to?(:count)
     refute_equal(before[:path], after[:path], "(path) Expected unique before and after paths") unless test_bot_skip?(:path)
   end
 

metadata

@@ -1,17 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: effective_test_bot
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-05 00:00:00.000000000 Z
+date: 2017-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: effective_resources
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="