effective_test_bot 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50ef005db97e70ce2576d749a0a4542409319da7
-  data.tar.gz: c12dc73aacd70b89fc4d4bcdde5b875c723f7c90
+  metadata.gz: 8daba6efe86cb1bdf02b6894c786581de4b1a0d1
+  data.tar.gz: d894f71336ba73f58c5bc968b5eae7e69272f476
 SHA512:
-  metadata.gz: 4c71082a5e0e90643d1bb90ceca1f01d9aaa37200c4d5a31cbc71dcfc59faa224c0572d1f13ceef05643b75d8df99665f816bf815617a4d2786402cc1418c047
-  data.tar.gz: 820f5070944df5997434796a7ce0d775fd809c3b686c19ac03e95589b80b1b74fef6b7b6bf17741c9bc3e4353422f58860664dfcb5227df8c164fdcff645881a
+  metadata.gz: 1d76c1ec917029ebed79bbb2b8c457573cc699aed07b45957831be86f0edddd08aea345054a29a89e5f799866071cc79d10a6abdad1ee21b4b7e91365e8ae2fd
+  data.tar.gz: 0602b7675e99bffc14cf809230532d2277c4285a11f069ead884f92c4c2575b6c3018f3ccb55e35732565246343fe8fb6b6b4df415457229e60e70b5eec66d03

data/lib/effective_test_bot/version.rb

@@ -1,3 +1,3 @@
 module EffectiveTestBot
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.4.0'.freeze
 end

data/lib/generators/templates/test_helper.rb

@@ -45,6 +45,7 @@ Capybara.javascript_driver = :webkit
 Capybara::Screenshot.autosave_on_failure = true
 Capybara::Screenshot.prune_strategy = :keep_last_run
 Capybara::Screenshot.webkit_options = { width: 1024, height: 768 }
+Capybara::Webkit.configure { |config| config.allow_unknown_urls }
 
 Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
 

data/test/concerns/test_botable/crud_test.rb

@@ -14,6 +14,11 @@ module TestBotable
           raise 'invalid parameters passed to crud_test(), expecting crud_test(Post || Post.new(), User.first, options_hash)'
         end
 
+        if (options[:skip] || options[:skips]).present? && (options[:skip] || options[:skips]).kind_of?(Hash) == false
+          raise 'invalid skip syntax, expecting skip: {create_invalid: [:path]}'
+        end
+
+        skips = options.delete(:skip) || options.delete(:skips) || {} # So you can skip sub tests
         test_options = crud_test_options(obj, user, options) # returns a Hash of let! options
         tests_prefix = crud_tests_prefix(options) # returns a string something like "test_bot (3)"
 
@@ -30,7 +35,11 @@ module TestBotable
             when :destroy           ; "#{tests_prefix} #destroy"
           end
 
-          define_method(test_name) { crud_action_test(test, test_options) }
+          if skips[test].present?
+            define_method(test_name) { crud_action_test(test, test_options.merge(skips: Array(skips[test]))) }
+          else
+            define_method(test_name) { crud_action_test(test, test_options) }
+          end
         end
       end
 
@@ -60,14 +69,15 @@ module TestBotable
           resource_name: resource_class.name.underscore,
           resource_attributes: resource_attributes,
           controller_namespace: options[:namespace],
-          user: user
+          user: user,
+          skips: Array(options[:skip] || options[:skips])
         }
       end
 
       # Run any test_bot tests first, in the order they're defined
       # then the rest of the tests with whatever order they come in
       def runnable_methods
-        self.public_instance_methods.select { |name| name.to_s.starts_with?('test_bot') }.map(&:to_s) +
+        self.public_instance_methods.select { |name| name.to_s.starts_with?('crud_test') }.map(&:to_s) +
           super.reject { |name| name.starts_with?('test_bot') }
       end
 
@@ -100,11 +110,11 @@ module TestBotable
         @num_defined_crud_tests = (@num_defined_crud_tests || 0) + 1
 
         if options[:label].present?
-          "test_bot: (#{options[:label]})"
+          "crud_test: (#{options[:label]})"
         elsif @num_defined_crud_tests > 1
-          "test_bot: (#{@num_defined_crud_tests})"
+          "crud_test: (#{@num_defined_crud_tests})"
         else
-          'test_bot:'
+          'crud_test:'
         end
       end
 
@@ -129,7 +139,7 @@ module TestBotable
         self.class.crud_test_options(obj, user, options)
       end.each { |k, v| self.class.let(k) { v } } # Using the regular let(:foo) { 'bar'} syntax
 
-      self.send(test)
+      self.public_send(test)
     end
   end
 end

data/test/support/effective_test_bot_assertions.rb

@@ -11,7 +11,7 @@ module EffectiveTestBotAssertions
     assert page.has_selector?('form#new_user')
   end
 
-  def assert_page_title(title = :any, message = 'expected page title to be present')
+  def assert_page_title(title = :any, message = 'Expected page title to be present')
     if title.present? && title != :any
       assert_title(title) # Capybara TitleQuery, match this text
     else
@@ -20,8 +20,8 @@ module EffectiveTestBotAssertions
     end
   end
 
-  def assert_page_status(status = 200)
-    assert_equal status, page.status_code, "expected page to load with #{status} HTTP status code"
+  def assert_page_status(status = 200, message = 'Expected :status: HTTP status code')
+    assert_equal status, page.status_code, message.sub(':status:', status.to_s)
   end
 
   def assert_no_js_errors
@@ -36,9 +36,9 @@ module EffectiveTestBotAssertions
     if key.present? && value.present?
       assert_equal value, flash[key.to_s]
     elsif key.present?
-      assert flash[key.to_s].present?, "expected flash[#{key}] to be present"
+      assert flash[key.to_s].present?, "Expected flash[#{key}] to be present"
     else
-      assert flash.present?, 'expected flash to be present'
+      assert flash.present?, 'Expected flash to be present'
     end
   end
 
@@ -49,9 +49,9 @@ module EffectiveTestBotAssertions
     if key.present? && value.present?
       assert_equal value, assigns[key.to_s]
     elsif key.present?
-      assert assigns[key.to_s].present?, "expected @#{key} to be assigned"
+      assert assigns[key.to_s].present?, "Expected @#{key} to be assigned"
     else
-      assert assigns.present?, 'expected assigns to be present'
+      assert assigns.present?, 'Expected assigns to be present'
     end
   end
 

data/test/support/effective_test_bot_form_helper.rb

@@ -30,10 +30,13 @@ module EffectiveTestBotFormHelper
         raise "unsupported field type #{[field.tag_name, field['type']].compact.join('_')}"
       end
     end
+
+    true
   end
 
   def clear_form
     all('input,select,textarea').each { |field| (field.set('') rescue false) }
+    true
   end
 
   # Operates on just string keys
@@ -60,7 +63,7 @@ module EffectiveTestBotFormHelper
     when 'input_number'
       Faker::Number.number(4)
     when 'input_password'
-      Faker::Internet.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'
       d = 10.times.map { DIGITS.sample }
       d[0] + d[1] + d[2] + '-' + d[3] + d[4] + d[5] + '-' + d[6] + d[7] + d[8] + d[9]
@@ -111,6 +114,7 @@ module EffectiveTestBotFormHelper
       first(:css, "input[type='submit']").click
     end
     synchronize!
+    true
   end
 
   # Submit form after disabling any HTML5 validations
@@ -125,8 +129,6 @@ module EffectiveTestBotFormHelper
     files = Array(files)
     uid = field['id']
 
-    page.driver.allow_url(Effective::Asset.s3_base_path)
-
     js = "fileList = Array();"
 
     files.each_with_index do |file, i|

data/test/support/effective_test_bot_test_helper.rb

@@ -22,11 +22,11 @@ module EffectiveTestBotTestHelper
   # EffectiveTestBot includes an after_filter on ApplicationController to set an http header
   # that encodes the flash message, and some of the assigns
   def flash
-    @flash ||= (JSON.parse(Base64.decode64(page.driver.browser.response_headers['Test-Bot-Flash'])) rescue {})
+    @flash ||= (JSON.parse(Base64.decode64(page.response_headers['Test-Bot-Flash'])) rescue {})
   end
 
   def assigns
-    @assigns ||= (JSON.parse(Base64.decode64(page.driver.browser.response_headers['Test-Bot-Assigns'])) rescue {})
+    @assigns ||= (JSON.parse(Base64.decode64(page.response_headers['Test-Bot-Assigns'])) rescue {})
   end
 
 end

data/test/test_botable/crud_test.rb

@@ -5,14 +5,14 @@ module CrudTest
     assert_page_status
     assert_page_title
     assert_no_js_errors
-    assert_assigns resource_name
+    assert_assigns(resource_name)
 
     # Make sure there's a form with a submit button
     form_selector = "form#new_#{resource_name}"
 
-    assert_selector form_selector, "page does not contain a form with selector #{form_selector}"
+    assert_selector form_selector, "Expected form with selector #{form_selector}"
     within(form_selector) do
-      assert_selector 'input[type=submit]', 'page form does not contain a submit button'
+      assert_selector 'input[type=submit]', 'Expected submit button to be present'
     end
   end
 
@@ -28,13 +28,13 @@ module CrudTest
 
     after = { count: resource_class.count, path: page.current_path }
 
-    refute_equal before[:count], after[:count], "unable to create #{resource_class} object"
-    refute_equal before[:path], after[:path], "unable to create #{resource_class} object"
+    refute_equal before[:count], after[:count], "Expected fill_form to create a #{resource_class} object"
+    refute_equal(before[:path], after[:path], "[create_valid: :path] Expected unique before and after paths") unless skip?(:path)
 
-    # In a rails controller, if i redirect to resources_path it may not assign the instance variable
+    # In a rails controller, if I redirect to resources_path it may not assign the instance variable
     # Wheras if I redirect to edit_resource_path I must ensure that the instance variable is set
     assert_assigns(resource_name) if after[:path].include?('/edit/')
-    assert(assigns[resource_name]['errors'].blank?) if assigns[resource_name].present?
+    assert_equal(nil, assigns[resource_name]['errors'], "Expected @#{resource_name}['errors'] to be blank") if assigns[resource_name].present?
   end
 
   def create_invalid
@@ -42,18 +42,20 @@ module CrudTest
     before = { count: resource_class.count }
 
     within("form#new_#{resource_name}") do
+      clear_form
       submit_novalidate_form
     end
 
     after = { count: resource_class.count }
 
-    assert_equal before[:count], after[:count], 'unexpectedly created object anyway'
-    assert_equal resources_path, page.current_path, 'did not return to #create url'
-    assert_page_title :any, 'page title missing after failed validation'
+    assert_equal before[:count], after[:count], "Expected: #{resource_class}.count to be unchanged"
+    assert_page_title :any, 'Expected page title to be present after failed validation'
 
     assert_flash :danger
     assert_assigns resource_name
-    assert assigns[resource_name]['errors'].present?
+    refute_equal nil, assigns[resource_name]['errors'], "Expected @#{resource_name}['errors'] to be present"
+
+    assert_equal(resources_path, page.current_path, "[create_invalid: :path] Expected current_path to match resource #create path") unless skip?(:path)
   end
 
   def edit
@@ -69,12 +71,10 @@ module CrudTest
     # Make sure there's a form with a submit button
     form_selector = "form#edit_#{resource_name}_#{resource.id}"
 
-    assert_selector form_selector, "page does not contain a form with selector #{form_selector}"
+    assert_selector form_selector, "Expected form with selector #{form_selector}"
     within(form_selector) do
-      assert_selector 'input[type=submit]', 'page form does not contain a submit button'
+      assert_selector 'input[type=submit]', 'Expected submit button to be present'
     end
-
-    assert_assigns resource_name
   end
 
   def update_valid
@@ -92,14 +92,15 @@ module CrudTest
 
     after = { count: resource_class.count, updated_at: (resource.updated_at rescue nil) }
 
-    assert_equal before[:count], after[:count], "updating resource unexpectedly changed #{resource_class}.count"
-    assert(after[:updated_at] > before[:updated_at], "failed to update resource") if resource.respond_to?(:updated_at)
+    assert_equal before[:count], after[:count], "Expected #{resource_class}.count to be unchanged"
+    refute_equal(before[:updated_at], after[:updated_at], "Expected @#{resource_name}.updated_at to have changed") if resource.respond_to?(:updated_at)
 
     assert_flash :success
+
     # In a rails controller, if i redirect to resources_path it may not assign the instance variable
     # Wheras if I redirect to edit_resource_path I must ensure that the instance variable is set
     assert_assigns(resource_name) if after[:path] == edit_resource_path(resource)
-    assert(assigns[resource_name]['errors'].blank?) if assigns[resource_name].present?
+    assert_equal(nil, assigns[resource_name]['errors'], "Expected @#{resource_name}['errors'] to be blank") if assigns[resource_name].present?
   end
 
   def update_invalid
@@ -117,14 +118,15 @@ module CrudTest
 
     after = { count: resource_class.count, updated_at: (resource.updated_at rescue nil) }
 
-    assert_equal before[:count], after[:count], "updating resource unexpectedly changed #{resource_class}.count"
-    assert_equal(after[:updated_at], before[:updated_at], 'unexpectedly updated object anyway') if resource.respond_to?(:updated_at)
-    assert_equal resource_path(resource), page.current_path, 'did not return to #update url'
-    assert_page_title :any, 'page title missing after failed validation'
+    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, 'Expected page title to be present after failed validation'
 
     assert_flash :danger
     assert_assigns resource_name
-    assert assigns[resource_name]['errors'].present?
+    refute_equal(nil, assigns[resource_name]['errors'], "Expected @#{resource_name}['errors'] to be present") if assigns[resource_name].present?
+
+    assert_equal(resource_path(resource), page.current_path, "[update_invalid: :path] Expected current_path to match resource #update path") unless skip?(:path)
   end
 
   def index
@@ -135,7 +137,7 @@ module CrudTest
     assert_page_status
     assert_page_title
     assert_no_js_errors
-    assert (assigns['datatable'].present? || assigns[resource_name.pluralize].present?), "expected @datatable or @#{resource_name.pluralize} to be set"
+    assert((assigns['datatable'].present? || assigns[resource_name.pluralize].present?), "[index: :assigns] Expected @#{resource_name.pluralize} or @datatable to be present") unless skip?(:assigns)
   end
 
   def show
@@ -161,17 +163,21 @@ module CrudTest
     assert_flash :success
 
     if resource.respond_to?(:archived)
-      assert after[:archived] == true, "expected #{resource_class}.archived == true"
+      assert after[:archived] == true, "Expected #{resource_class}.archived? to be true"
     else
-      refute_equal before[:count], after[:count], "unable to delete #{resource_class}"
+      refute_equal before[:count], after[:count], "Expected: #{resource_class}.count to decrement by 1"
     end
   end
 
   protected
 
+  def skip?(test)
+    skips.include?(test)
+  end
+
   def find_or_create_resource!
     existing = resource_class.last
-    existing.present? ? existing : create_resource!
+    (existing.present? && !existing.kind_of?(User)) ? existing : create_resource!
   end
 
   def create_resource!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_test_bot
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-26 00:00:00.000000000 Z
+date: 2015-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: capybara-screenshot
   requirement: !ruby/object:Gem::Requirement