shoulda-matchers 1.4.2 → 1.5.0

data/spec/spec_helper.rb

@@ -7,7 +7,6 @@ ENV['RAILS_ENV'] = 'test'
 ENV['BUNDLE_GEMFILE'] ||= TESTAPP_ROOT + '/Gemfile'
 
 require "#{TESTAPP_ROOT}/config/environment"
-require 'rspec'
 require 'bourne'
 require 'shoulda-matchers'
 require 'rspec/rails'
@@ -20,7 +19,7 @@ Dir[File.join(PROJECT_ROOT, 'spec', 'support', '**', '*.rb')].each { |file| requ
 
 # Run the migrations
 ActiveRecord::Migration.verbose = false
-ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate")
+ActiveRecord::Migrator.migrate(Rails.root.join('db/migrate'))
 
 RSpec.configure do |config|
   config.mock_with :mocha

data/spec/support/active_model_versions.rb

@@ -1,4 +1,8 @@
 RSpec.configure do |c|
+  def active_model_3_0?
+    ::ActiveModel::VERSION::MAJOR == 3 && ::ActiveModel::VERSION::MINOR >= 0
+  end
+
   def active_model_3_1?
     ::ActiveModel::VERSION::MAJOR == 3 && ::ActiveModel::VERSION::MINOR >= 1
   end

data/spec/support/activemodel_helpers.rb

@@ -0,0 +1,19 @@
+module ActiveModelHelpers
+  def custom_validation(&block)
+    define_model(:example, :attr => :integer) do
+      validate :custom_validation
+
+      define_method(:custom_validation, &block)
+    end.new
+  end
+
+  def validating_format(options)
+    define_model :example, :attr => :string do
+      validates_format_of :attr, options
+    end.new
+  end
+end
+
+RSpec.configure do |c|
+  c.include ActiveModelHelpers
+end

data/spec/support/controller_builder.rb

@@ -1,6 +1,6 @@
 module ControllerBuilder
-  TMP_VIEW_PATH =
-    File.expand_path(File.join(TESTAPP_ROOT, 'tmp', 'views')).freeze
+  TMP_VIEW_PATH = File.expand_path(File.join(TESTAPP_ROOT, 'tmp',
+    'views')).freeze
 
   def self.included(example_group)
     example_group.class_eval do
@@ -36,24 +36,26 @@ module ControllerBuilder
     controller_class.view_paths = [TMP_VIEW_PATH]
 
     define_routes do
-      match 'examples', :to => "examples##{action}"
+      get 'examples', :to => "examples##{action}"
     end
 
-    create_view("examples/#{action}.html.erb", "abc")
-    create_view("examples/#{partial}.html.erb", "partial")
+    create_view("examples/#{action}.html.erb", 'action')
+    create_view("examples/#{partial}.html.erb", 'partial')
 
+    setup_rails_controller_test(controller_class)
+    get action
+
+    @controller
+  end
+
+  def setup_rails_controller_test(controller_class)
     @controller = controller_class.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
+    @request = ::ActionController::TestRequest.new
+    @response = ::ActionController::TestResponse.new
 
     class << self
       include ActionController::TestCase::Behavior
     end
-    @routes = Rails.application.routes
-
-    get action
-
-    @controller
   end
 
   def create_view(path, contents)
@@ -62,6 +64,30 @@ module ControllerBuilder
     File.open(full_path, 'w') { |file| file.write(contents) }
   end
 
+  def controller_for_resource_with_strong_parameters(&block)
+    define_model "User"
+    controller_class = define_controller "Users" do
+      def new
+        @user = User.new
+        render :nothing => true
+      end
+
+      def create
+        @user = User.create(user_params)
+        render :nothing => true
+      end
+
+      private
+      define_method :user_params, &block
+    end
+
+    setup_rails_controller_test(controller_class)
+
+    define_routes { resources :users }
+
+    controller_class
+  end
+
   private
 
   def delete_temporary_views

data/spec/support/model_builder.rb

@@ -46,13 +46,19 @@ module ModelBuilder
   def define_model(name, columns = {}, &block)
     class_name = name.to_s.pluralize.classify
     table_name = class_name.tableize
-
-    create_table(table_name) do |table|
+    table_block = lambda do |table|
       columns.each do |name, type|
         table.column name, type
       end
     end
 
+    if columns.key?(:id) && columns[:id] == false
+      columns.delete(:id)
+      create_table(table_name, :id => false, &table_block)
+    else
+      create_table(table_name, &table_block)
+    end
+
     define_model_class(class_name, &block)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoulda-matchers
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-30 00:00:00.000000000 Z
+date: 2013-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -39,7 +39,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -47,7 +47,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -55,7 +55,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -63,7 +63,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -103,7 +103,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.9
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -111,7 +111,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.9
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -133,7 +133,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
@@ -141,7 +141,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
@@ -160,6 +160,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.8.1
+- !ruby/object:Gem::Dependency
+  name: strong_parameters
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Making tests easy on the fingers and eyes
 email: support@thoughtbot.com
 executables: []
@@ -198,6 +214,7 @@ files:
 - lib/shoulda/matchers/action_controller/route_matcher.rb
 - lib/shoulda/matchers/action_controller/set_session_matcher.rb
 - lib/shoulda/matchers/action_controller/set_the_flash_matcher.rb
+- lib/shoulda/matchers/action_controller/strong_parameters_matcher.rb
 - lib/shoulda/matchers/action_mailer.rb
 - lib/shoulda/matchers/action_mailer/have_sent_email_matcher.rb
 - lib/shoulda/matchers/active_model.rb
@@ -234,56 +251,52 @@ files:
 - lib/shoulda/matchers/integrations/test_unit.rb
 - lib/shoulda/matchers/version.rb
 - shoulda-matchers.gemspec
-- spec/fixtures/addresses.yml
-- spec/fixtures/friendships.yml
-- spec/fixtures/posts.yml
-- spec/fixtures/products.yml
-- spec/fixtures/taggings.yml
-- spec/fixtures/tags.yml
-- spec/fixtures/users.yml
-- spec/shoulda/action_controller/assign_to_matcher_spec.rb
-- spec/shoulda/action_controller/filter_param_matcher_spec.rb
-- spec/shoulda/action_controller/redirect_to_matcher_spec.rb
-- spec/shoulda/action_controller/render_template_matcher_spec.rb
-- spec/shoulda/action_controller/render_with_layout_matcher_spec.rb
-- spec/shoulda/action_controller/respond_with_content_type_matcher_spec.rb
-- spec/shoulda/action_controller/respond_with_matcher_spec.rb
-- spec/shoulda/action_controller/route_matcher_spec.rb
-- spec/shoulda/action_controller/set_session_matcher_spec.rb
-- spec/shoulda/action_controller/set_the_flash_matcher_spec.rb
-- spec/shoulda/action_mailer/have_sent_email_spec.rb
-- spec/shoulda/active_model/allow_mass_assignment_of_matcher_spec.rb
-- spec/shoulda/active_model/allow_value_matcher_spec.rb
-- spec/shoulda/active_model/disallow_value_matcher_spec.rb
-- spec/shoulda/active_model/ensure_exclusion_of_matcher_spec.rb
-- spec/shoulda/active_model/ensure_inclusion_of_matcher_spec.rb
-- spec/shoulda/active_model/ensure_length_of_matcher_spec.rb
-- spec/shoulda/active_model/exception_message_finder_spec.rb
-- spec/shoulda/active_model/helpers_spec.rb
-- spec/shoulda/active_model/only_integer_matcher_spec.rb
-- spec/shoulda/active_model/validate_acceptance_of_matcher_spec.rb
-- spec/shoulda/active_model/validate_confirmation_of_matcher_spec.rb
-- spec/shoulda/active_model/validate_format_of_matcher_spec.rb
-- spec/shoulda/active_model/validate_numericality_of_matcher_spec.rb
-- spec/shoulda/active_model/validate_presence_of_matcher_spec.rb
-- spec/shoulda/active_model/validate_uniqueness_of_matcher_spec.rb
-- spec/shoulda/active_model/validation_message_finder_spec.rb
-- spec/shoulda/active_record/accept_nested_attributes_for_matcher_spec.rb
-- spec/shoulda/active_record/association_matcher_spec.rb
-- spec/shoulda/active_record/have_db_column_matcher_spec.rb
-- spec/shoulda/active_record/have_db_index_matcher_spec.rb
-- spec/shoulda/active_record/have_readonly_attributes_matcher_spec.rb
-- spec/shoulda/active_record/query_the_database_matcher_spec.rb
-- spec/shoulda/active_record/serialize_matcher_spec.rb
-- spec/shoulda/independent/delegate_matcher_spec.rb
+- spec/shoulda/matchers/action_controller/assign_to_matcher_spec.rb
+- spec/shoulda/matchers/action_controller/filter_param_matcher_spec.rb
+- spec/shoulda/matchers/action_controller/redirect_to_matcher_spec.rb
+- spec/shoulda/matchers/action_controller/render_template_matcher_spec.rb
+- spec/shoulda/matchers/action_controller/render_with_layout_matcher_spec.rb
+- spec/shoulda/matchers/action_controller/respond_with_content_type_matcher_spec.rb
+- spec/shoulda/matchers/action_controller/respond_with_matcher_spec.rb
+- spec/shoulda/matchers/action_controller/route_matcher_spec.rb
+- spec/shoulda/matchers/action_controller/set_session_matcher_spec.rb
+- spec/shoulda/matchers/action_controller/set_the_flash_matcher_spec.rb
+- spec/shoulda/matchers/action_controller/strong_parameters_matcher_spec.rb
+- spec/shoulda/matchers/action_mailer/have_sent_email_spec.rb
+- spec/shoulda/matchers/active_model/allow_mass_assignment_of_matcher_spec.rb
+- spec/shoulda/matchers/active_model/allow_value_matcher_spec.rb
+- spec/shoulda/matchers/active_model/disallow_value_matcher_spec.rb
+- spec/shoulda/matchers/active_model/ensure_exclusion_of_matcher_spec.rb
+- spec/shoulda/matchers/active_model/ensure_inclusion_of_matcher_spec.rb
+- spec/shoulda/matchers/active_model/ensure_length_of_matcher_spec.rb
+- spec/shoulda/matchers/active_model/exception_message_finder_spec.rb
+- spec/shoulda/matchers/active_model/helpers_spec.rb
+- spec/shoulda/matchers/active_model/only_integer_matcher_spec.rb
+- spec/shoulda/matchers/active_model/validate_acceptance_of_matcher_spec.rb
+- spec/shoulda/matchers/active_model/validate_confirmation_of_matcher_spec.rb
+- spec/shoulda/matchers/active_model/validate_format_of_matcher_spec.rb
+- spec/shoulda/matchers/active_model/validate_numericality_of_matcher_spec.rb
+- spec/shoulda/matchers/active_model/validate_presence_of_matcher_spec.rb
+- spec/shoulda/matchers/active_model/validate_uniqueness_of_matcher_spec.rb
+- spec/shoulda/matchers/active_model/validation_message_finder_spec.rb
+- spec/shoulda/matchers/active_record/accept_nested_attributes_for_matcher_spec.rb
+- spec/shoulda/matchers/active_record/association_matcher_spec.rb
+- spec/shoulda/matchers/active_record/have_db_column_matcher_spec.rb
+- spec/shoulda/matchers/active_record/have_db_index_matcher_spec.rb
+- spec/shoulda/matchers/active_record/have_readonly_attributes_matcher_spec.rb
+- spec/shoulda/matchers/active_record/query_the_database_matcher_spec.rb
+- spec/shoulda/matchers/active_record/serialize_matcher_spec.rb
+- spec/shoulda/matchers/independent/delegate_matcher_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_model_versions.rb
+- spec/support/activemodel_helpers.rb
 - spec/support/class_builder.rb
 - spec/support/controller_builder.rb
 - spec/support/mailer_builder.rb
 - spec/support/model_builder.rb
 homepage: http://thoughtbot.com/community/
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -296,7 +309,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3885961739329133579
+      hash: -1249143589837050038
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -305,10 +318,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3885961739329133579
+      hash: -1249143589837050038
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Making tests easy on the fingers and eyes
@@ -316,50 +329,45 @@ test_files:
 - features/rails_integration.feature
 - features/step_definitions/rails_steps.rb
 - features/support/env.rb
-- spec/fixtures/addresses.yml
-- spec/fixtures/friendships.yml
-- spec/fixtures/posts.yml
-- spec/fixtures/products.yml
-- spec/fixtures/taggings.yml
-- spec/fixtures/tags.yml
-- spec/fixtures/users.yml
-- spec/shoulda/action_controller/assign_to_matcher_spec.rb
-- spec/shoulda/action_controller/filter_param_matcher_spec.rb
-- spec/shoulda/action_controller/redirect_to_matcher_spec.rb
-- spec/shoulda/action_controller/render_template_matcher_spec.rb
-- spec/shoulda/action_controller/render_with_layout_matcher_spec.rb
-- spec/shoulda/action_controller/respond_with_content_type_matcher_spec.rb
-- spec/shoulda/action_controller/respond_with_matcher_spec.rb
-- spec/shoulda/action_controller/route_matcher_spec.rb
-- spec/shoulda/action_controller/set_session_matcher_spec.rb
-- spec/shoulda/action_controller/set_the_flash_matcher_spec.rb
-- spec/shoulda/action_mailer/have_sent_email_spec.rb
-- spec/shoulda/active_model/allow_mass_assignment_of_matcher_spec.rb
-- spec/shoulda/active_model/allow_value_matcher_spec.rb
-- spec/shoulda/active_model/disallow_value_matcher_spec.rb
-- spec/shoulda/active_model/ensure_exclusion_of_matcher_spec.rb
-- spec/shoulda/active_model/ensure_inclusion_of_matcher_spec.rb
-- spec/shoulda/active_model/ensure_length_of_matcher_spec.rb
-- spec/shoulda/active_model/exception_message_finder_spec.rb
-- spec/shoulda/active_model/helpers_spec.rb
-- spec/shoulda/active_model/only_integer_matcher_spec.rb
-- spec/shoulda/active_model/validate_acceptance_of_matcher_spec.rb
-- spec/shoulda/active_model/validate_confirmation_of_matcher_spec.rb
-- spec/shoulda/active_model/validate_format_of_matcher_spec.rb
-- spec/shoulda/active_model/validate_numericality_of_matcher_spec.rb
-- spec/shoulda/active_model/validate_presence_of_matcher_spec.rb
-- spec/shoulda/active_model/validate_uniqueness_of_matcher_spec.rb
-- spec/shoulda/active_model/validation_message_finder_spec.rb
-- spec/shoulda/active_record/accept_nested_attributes_for_matcher_spec.rb
-- spec/shoulda/active_record/association_matcher_spec.rb
-- spec/shoulda/active_record/have_db_column_matcher_spec.rb
-- spec/shoulda/active_record/have_db_index_matcher_spec.rb
-- spec/shoulda/active_record/have_readonly_attributes_matcher_spec.rb
-- spec/shoulda/active_record/query_the_database_matcher_spec.rb
-- spec/shoulda/active_record/serialize_matcher_spec.rb
-- spec/shoulda/independent/delegate_matcher_spec.rb
+- spec/shoulda/matchers/action_controller/assign_to_matcher_spec.rb
+- spec/shoulda/matchers/action_controller/filter_param_matcher_spec.rb
+- spec/shoulda/matchers/action_controller/redirect_to_matcher_spec.rb
+- spec/shoulda/matchers/action_controller/render_template_matcher_spec.rb
+- spec/shoulda/matchers/action_controller/render_with_layout_matcher_spec.rb
+- spec/shoulda/matchers/action_controller/respond_with_content_type_matcher_spec.rb
+- spec/shoulda/matchers/action_controller/respond_with_matcher_spec.rb
+- spec/shoulda/matchers/action_controller/route_matcher_spec.rb
+- spec/shoulda/matchers/action_controller/set_session_matcher_spec.rb
+- spec/shoulda/matchers/action_controller/set_the_flash_matcher_spec.rb
+- spec/shoulda/matchers/action_controller/strong_parameters_matcher_spec.rb
+- spec/shoulda/matchers/action_mailer/have_sent_email_spec.rb
+- spec/shoulda/matchers/active_model/allow_mass_assignment_of_matcher_spec.rb
+- spec/shoulda/matchers/active_model/allow_value_matcher_spec.rb
+- spec/shoulda/matchers/active_model/disallow_value_matcher_spec.rb
+- spec/shoulda/matchers/active_model/ensure_exclusion_of_matcher_spec.rb
+- spec/shoulda/matchers/active_model/ensure_inclusion_of_matcher_spec.rb
+- spec/shoulda/matchers/active_model/ensure_length_of_matcher_spec.rb
+- spec/shoulda/matchers/active_model/exception_message_finder_spec.rb
+- spec/shoulda/matchers/active_model/helpers_spec.rb
+- spec/shoulda/matchers/active_model/only_integer_matcher_spec.rb
+- spec/shoulda/matchers/active_model/validate_acceptance_of_matcher_spec.rb
+- spec/shoulda/matchers/active_model/validate_confirmation_of_matcher_spec.rb
+- spec/shoulda/matchers/active_model/validate_format_of_matcher_spec.rb
+- spec/shoulda/matchers/active_model/validate_numericality_of_matcher_spec.rb
+- spec/shoulda/matchers/active_model/validate_presence_of_matcher_spec.rb
+- spec/shoulda/matchers/active_model/validate_uniqueness_of_matcher_spec.rb
+- spec/shoulda/matchers/active_model/validation_message_finder_spec.rb
+- spec/shoulda/matchers/active_record/accept_nested_attributes_for_matcher_spec.rb
+- spec/shoulda/matchers/active_record/association_matcher_spec.rb
+- spec/shoulda/matchers/active_record/have_db_column_matcher_spec.rb
+- spec/shoulda/matchers/active_record/have_db_index_matcher_spec.rb
+- spec/shoulda/matchers/active_record/have_readonly_attributes_matcher_spec.rb
+- spec/shoulda/matchers/active_record/query_the_database_matcher_spec.rb
+- spec/shoulda/matchers/active_record/serialize_matcher_spec.rb
+- spec/shoulda/matchers/independent/delegate_matcher_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_model_versions.rb
+- spec/support/activemodel_helpers.rb
 - spec/support/class_builder.rb
 - spec/support/controller_builder.rb
 - spec/support/mailer_builder.rb