francois-shoulda 2.0.5.4 → 2.10.1

data/test/test_helper.rb

@@ -1,6 +1,7 @@
 require 'fileutils'
+
 # Load the environment
-ENV['RAILS_ENV'] = 'sqlite3'
+ENV['RAILS_ENV'] = 'test'
 
 rails_root = File.dirname(__FILE__) + '/rails_root'
 
@@ -31,3 +32,4 @@ class Test::Unit::TestCase #:nodoc:
 end
 
 require 'test/fail_macros'
+require 'test/model_builder'

data/test/unit/address_test.rb

@@ -4,29 +4,7 @@ class AddressTest < Test::Unit::TestCase
   fixtures :all
 
   should_belong_to :addressable
-  should_require_unique_attributes :title, :scoped_to => [:addressable_id, :addressable_type]
+  should_validate_uniqueness_of :title, :scoped_to => [:addressable_id, :addressable_type]
   should_ensure_length_at_least :zip, 5
   should_only_allow_numeric_values_for :zip
-
-  context "A non-numeric zip" do
-    setup do
-      @address = Address.new(:zip => "bc")
-    end
-
-    should "be invalid" do
-      assert_invalid @address
-    end
-  end
-
-  context "A numeric zip" do
-    setup do
-      @address = Address.new(:zip => "90210")
-    end
-
-    should_fail do
-      should "NOT be invalid" do
-        assert_invalid @address
-      end
-    end
-  end
 end

data/test/unit/dog_test.rb

@@ -1,7 +1,10 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class DogTest < Test::Unit::TestCase
+class Pets::DogTest < Test::Unit::TestCase
   should_belong_to :user
-  should_belong_to :address
+  should_belong_to :address, :dependent => :destroy
+  should_have_many :treats
   should_have_and_belong_to_many :fleas
+  should_require_attributes :treats, :fleas
+  should_validate_presence_of :owner_id
 end

data/test/unit/post_test.rb

@@ -9,7 +9,11 @@ class PostTest < Test::Unit::TestCase
   should_have_many :through_tags, :through => :taggings
 
   should_require_unique_attributes :title
-  should_require_attributes :body, :message => /wtf/
-  should_require_attributes :title
-  should_only_allow_numeric_values_for :user_id
+  should_validate_presence_of :body, :message => /wtf/
+  should_validate_presence_of :title
+  should_validate_numericality_of :user_id
+
+  should_fail do
+    should_validate_uniqueness_of :title, :case_sensitive => false
+  end
 end

data/test/unit/product_test.rb

@@ -6,7 +6,7 @@ class ProductTest < ActiveSupport::TestCase
       @product = Product.new(:tangible => false)
     end
 
-    should_require_attributes :title
+    should_validate_presence_of :title
     should_not_allow_values_for :size, "22"
     should_allow_values_for :size, "22kb"
     should_ensure_value_in_range :price, 0..99
@@ -17,7 +17,7 @@ class ProductTest < ActiveSupport::TestCase
       @product = Product.new(:tangible => true)
     end
 
-    should_require_attributes :price
+    should_validate_presence_of :price
     should_ensure_value_in_range :price, 1..9999
     should_ensure_value_in_range :weight, 1..100
     should_not_allow_values_for :size, "22", "10x15"

data/test/unit/tag_test.rb

@@ -6,7 +6,8 @@ class TagTest < Test::Unit::TestCase
 
   should_ensure_length_at_least :name, 2
 
-  should_not_allow_mass_assignment_of :secret
+  should_protect_attributes :secret
+  should_allow_mass_assignment_of :name
 
   should_fail do
     should_not_allow_mass_assignment_of :name

data/test/unit/user_test.rb

@@ -14,8 +14,16 @@ class UserTest < Test::Unit::TestCase
   should_have_one :address
   should_have_one :address, :dependent => :destroy
 
-  should_have_indices :email, :name, [:email, :name]
+  should_have_indices :email, :name
   should_have_index :age
+  should_have_index [:email, :name], :unique => true
+  should_have_index :age, :unique => false
+
+  should_fail do
+    should_have_index :phone
+    should_have_index :email, :unique => false
+    should_have_index :age, :unique => true
+  end
 
   should_have_named_scope :old,       :conditions => "age > 50"
   should_have_named_scope :eighteen,  :conditions => { :age => 18 }
@@ -32,25 +40,33 @@ class UserTest < Test::Unit::TestCase
   should_not_allow_values_for :email, "blah", "b lah"
   should_allow_values_for :email, "a@b.com", "asdf@asdf.com"
   should_ensure_length_in_range :email, 1..100
-  should_ensure_value_in_range :age, 1..100
+  should_ensure_value_in_range :age, 1..100, :low_message  => /greater/,
+                                             :high_message => /less/
+  should_fail do
+    should_ensure_value_in_range :age, 1..100, :low_message  => /more/,
+                                               :high_message => /less/
+  end
+  should_fail do
+    should_ensure_value_in_range :age, 1..100, :low_message  => /greater/,
+                                               :high_message => /fewer/
+  end
   should_not_allow_mass_assignment_of :password
-  should_allow_mass_assignment_of :name, :email
   should_have_class_methods :find, :destroy
   should_have_instance_methods :email, :age, :email=, :valid?
   should_have_db_columns :name, :email, :age
-  should_have_db_column :id, :type => "integer", :primary => true
-  should_have_db_column :email, :type => "string", :default => nil,   :precision => nil, :limit    => 255,
-                                :null => true,     :primary => false, :scale     => nil, :sql_type => 'varchar(255)'
+  should_have_db_column :id,    :type => "integer"
+  should_have_db_column :email, :type => "string", :default => nil, :precision => nil, :limit    => 255,
+                                :null => true,     :scale   => nil
+  should_validate_acceptance_of :eula
   should_require_acceptance_of :eula
-  should_require_unique_attributes :email, :scoped_to => :name
+  should_validate_uniqueness_of :email, :scoped_to => :name, :case_sensitive => false
 
   should_ensure_length_is :ssn, 9, :message => "Social Security Number is not the right length"
-  should_only_allow_numeric_values_for :ssn
+  should_validate_numericality_of :ssn
 
   should_have_readonly_attributes :name
 
   should_fail do
     should_not_allow_mass_assignment_of :name, :age
-    should_allow_mass_assignment_of :password
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: francois-shoulda
 version: !ruby/object:Gem::Version 
-  version: 2.0.5.4
+  version: 2.10.1
 platform: ruby
 authors: 
 - Tammer Saleh
@@ -9,18 +9,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-15 00:00:00 -07:00
+date: 2009-03-05 00:00:00 -08:00
 default_executable: convert_to_should_syntax
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.0.0
-    version: 
+dependencies: []
+
 description: 
 email: tsaleh@thoughtbot.com
 executables: 
@@ -37,32 +29,61 @@ files:
 - README.rdoc
 - bin/convert_to_should_syntax
 - lib/shoulda
+- lib/shoulda/action_controller
+- lib/shoulda/action_controller/helpers.rb
+- lib/shoulda/action_controller/macros.rb
+- lib/shoulda/action_controller/matchers
+- lib/shoulda/action_controller/matchers/assign_to_matcher.rb
+- lib/shoulda/action_controller/matchers/filter_param_matcher.rb
+- lib/shoulda/action_controller/matchers/render_with_layout_matcher.rb
+- lib/shoulda/action_controller/matchers/respond_with_content_type_matcher.rb
+- lib/shoulda/action_controller/matchers/respond_with_matcher.rb
+- lib/shoulda/action_controller/matchers/route_matcher.rb
+- lib/shoulda/action_controller/matchers/set_session_matcher.rb
+- lib/shoulda/action_controller/matchers/set_the_flash_matcher.rb
+- lib/shoulda/action_controller/matchers.rb
+- lib/shoulda/action_controller.rb
 - lib/shoulda/action_mailer
 - lib/shoulda/action_mailer/assertions.rb
 - lib/shoulda/action_mailer.rb
+- lib/shoulda/action_view
+- lib/shoulda/action_view/macros.rb
+- lib/shoulda/action_view.rb
 - lib/shoulda/active_record
 - lib/shoulda/active_record/assertions.rb
+- lib/shoulda/active_record/helpers.rb
 - lib/shoulda/active_record/macros.rb
+- lib/shoulda/active_record/matchers
+- lib/shoulda/active_record/matchers/allow_mass_assignment_of_matcher.rb
+- lib/shoulda/active_record/matchers/allow_value_matcher.rb
+- lib/shoulda/active_record/matchers/association_matcher.rb
+- lib/shoulda/active_record/matchers/ensure_inclusion_of_matcher.rb
+- lib/shoulda/active_record/matchers/ensure_length_of_matcher.rb
+- lib/shoulda/active_record/matchers/have_db_column_matcher.rb
+- lib/shoulda/active_record/matchers/have_index_matcher.rb
+- lib/shoulda/active_record/matchers/have_named_scope_matcher.rb
+- lib/shoulda/active_record/matchers/have_readonly_attribute_matcher.rb
+- lib/shoulda/active_record/matchers/validate_acceptance_of_matcher.rb
+- lib/shoulda/active_record/matchers/validate_numericality_of_matcher.rb
+- lib/shoulda/active_record/matchers/validate_presence_of_matcher.rb
+- lib/shoulda/active_record/matchers/validate_uniqueness_of_matcher.rb
+- lib/shoulda/active_record/matchers/validation_matcher.rb
+- lib/shoulda/active_record/matchers.rb
 - lib/shoulda/active_record.rb
 - lib/shoulda/assertions.rb
+- lib/shoulda/autoload_macros.rb
 - lib/shoulda/context.rb
-- lib/shoulda/controller
-- lib/shoulda/controller/formats
-- lib/shoulda/controller/formats/html.rb
-- lib/shoulda/controller/formats/xml.rb
-- lib/shoulda/controller/helpers.rb
-- lib/shoulda/controller/macros.rb
-- lib/shoulda/controller/resource_options.rb
-- lib/shoulda/controller.rb
 - lib/shoulda/helpers.rb
 - lib/shoulda/macros.rb
 - lib/shoulda/private_helpers.rb
 - lib/shoulda/proc_extensions.rb
 - lib/shoulda/rails.rb
+- lib/shoulda/rspec.rb
 - lib/shoulda/tasks
 - lib/shoulda/tasks/list_tests.rake
 - lib/shoulda/tasks/yaml_to_shoulda.rake
 - lib/shoulda/tasks.rb
+- lib/shoulda/test_unit.rb
 - lib/shoulda.rb
 - rails/init.rb
 - test/fail_macros.rb
@@ -77,7 +98,33 @@ files:
 - test/functional
 - test/functional/posts_controller_test.rb
 - test/functional/users_controller_test.rb
+- test/matchers
+- test/matchers/active_record
+- test/matchers/active_record/allow_mass_assignment_of_matcher_test.rb
+- test/matchers/active_record/allow_value_matcher_test.rb
+- test/matchers/active_record/association_matcher_test.rb
+- test/matchers/active_record/ensure_inclusion_of_matcher_test.rb
+- test/matchers/active_record/ensure_length_of_matcher_test.rb
+- test/matchers/active_record/have_db_column_matcher_test.rb
+- test/matchers/active_record/have_index_matcher_test.rb
+- test/matchers/active_record/have_named_scope_matcher_test.rb
+- test/matchers/active_record/have_readonly_attributes_matcher_test.rb
+- test/matchers/active_record/validate_acceptance_of_matcher_test.rb
+- test/matchers/active_record/validate_numericality_of_matcher_test.rb
+- test/matchers/active_record/validate_presence_of_matcher_test.rb
+- test/matchers/active_record/validate_uniqueness_of_matcher_test.rb
+- test/matchers/controller
+- test/matchers/controller/assign_to_matcher_test.rb
+- test/matchers/controller/filter_param_matcher_test.rb
+- test/matchers/controller/render_with_layout_matcher_test.rb
+- test/matchers/controller/respond_with_content_type_matcher_test.rb
+- test/matchers/controller/respond_with_matcher_test.rb
+- test/matchers/controller/route_matcher_test.rb
+- test/matchers/controller/set_session_matcher_test.rb
+- test/matchers/controller/set_the_flash_matcher.rb
+- test/model_builder.rb
 - test/other
+- test/other/autoload_macro_test.rb
 - test/other/context_test.rb
 - test/other/convert_to_should_syntax_test.rb
 - test/other/helpers_test.rb
@@ -95,13 +142,15 @@ files:
 - test/rails_root/app/helpers/users_helper.rb
 - test/rails_root/app/models
 - test/rails_root/app/models/address.rb
-- test/rails_root/app/models/dog.rb
 - test/rails_root/app/models/flea.rb
 - test/rails_root/app/models/friendship.rb
+- test/rails_root/app/models/pets
+- test/rails_root/app/models/pets/dog.rb
 - test/rails_root/app/models/post.rb
 - test/rails_root/app/models/product.rb
 - test/rails_root/app/models/tag.rb
 - test/rails_root/app/models/tagging.rb
+- test/rails_root/app/models/treat.rb
 - test/rails_root/app/models/user.rb
 - test/rails_root/app/views
 - test/rails_root/app/views/layouts
@@ -123,7 +172,7 @@ files:
 - test/rails_root/config/database.yml
 - test/rails_root/config/environment.rb
 - test/rails_root/config/environments
-- test/rails_root/config/environments/sqlite3.rb
+- test/rails_root/config/environments/test.rb
 - test/rails_root/config/initializers
 - test/rails_root/config/initializers/new_rails_defaults.rb
 - test/rails_root/config/initializers/shoulda.rb
@@ -140,9 +189,11 @@ files:
 - test/rails_root/db/migrate/008_create_dogs_fleas.rb
 - test/rails_root/db/migrate/009_create_products.rb
 - test/rails_root/db/migrate/010_create_friendships.rb
+- test/rails_root/db/migrate/011_create_treats.rb
 - test/rails_root/db/schema.rb
 - test/rails_root/log
 - test/rails_root/log/sqlite3.log
+- test/rails_root/log/test.log
 - test/rails_root/public
 - test/rails_root/public/404.html
 - test/rails_root/public/422.html
@@ -150,9 +201,20 @@ files:
 - test/rails_root/script
 - test/rails_root/script/console
 - test/rails_root/script/generate
+- test/rails_root/test
+- test/rails_root/test/shoulda_macros
+- test/rails_root/test/shoulda_macros/custom_macro.rb
 - test/rails_root/vendor
+- test/rails_root/vendor/gems
+- test/rails_root/vendor/gems/gem_with_macro-0.0.1
+- test/rails_root/vendor/gems/gem_with_macro-0.0.1/shoulda_macros
+- test/rails_root/vendor/gems/gem_with_macro-0.0.1/shoulda_macros/gem_macro.rb
 - test/rails_root/vendor/plugins
+- test/rails_root/vendor/plugins/plugin_with_macro
+- test/rails_root/vendor/plugins/plugin_with_macro/shoulda_macros
+- test/rails_root/vendor/plugins/plugin_with_macro/shoulda_macros/plugin_macro.rb
 - test/README
+- test/rspec_test.rb
 - test/test_helper.rb
 - test/unit
 - test/unit/address_test.rb
@@ -169,7 +231,6 @@ homepage: http://thoughtbot.com/projects/shoulda
 post_install_message: 
 rdoc_options: 
 - --line-numbers
-- --inline-source
 - --main
 - README.rdoc
 require_paths: 

data/lib/shoulda/controller.rb

@@ -1,30 +0,0 @@
-require 'shoulda'
-require 'shoulda/controller/helpers'
-require 'shoulda/controller/resource_options'
-require 'shoulda/controller/macros'
-
-module Test # :nodoc: all
-  module Unit
-    class TestCase
-      extend ThoughtBot::Shoulda::Controller::Macros
-      include ThoughtBot::Shoulda::Controller::Helpers
-      ThoughtBot::Shoulda::Controller::VALID_FORMATS.each do |format|
-        include "ThoughtBot::Shoulda::Controller::#{format.to_s.upcase}".constantize
-      end
-    end
-  end
-end
-
-require 'shoulda/active_record/assertions'
-require 'shoulda/action_mailer/assertions'
-
-module ActionController #:nodoc: all
-  module Integration
-    class Session
-      include ThoughtBot::Shoulda::Assertions
-      include ThoughtBot::Shoulda::Helpers
-      include ThoughtBot::Shoulda::ActiveRecord::Assertions
-      include ThoughtBot::Shoulda::ActionMailer::Assertions
-    end
-  end
-end

data/lib/shoulda/controller/formats/html.rb

@@ -1,201 +0,0 @@
-module ThoughtBot # :nodoc: 
-  module Shoulda # :nodoc: 
-    module Controller # :nodoc:
-      module HTML # :nodoc: all
-        def self.included(other)
-          other.class_eval do
-            extend ThoughtBot::Shoulda::Controller::HTML::ClassMethods
-          end
-        end
-  
-        module ClassMethods 
-          def controller_name_from_class
-            self.name.gsub(/Test/, '')
-          end
-
-          def make_show_html_tests(res)
-            context "on GET to #{controller_name_from_class}#show" do
-              setup do
-                record = get_existing_record(res)
-                parent_params = make_parent_params(res, record)
-                get :show, parent_params.merge({ res.identifier => record.to_param })          
-              end
-
-              if res.denied.actions.include?(:show)
-                should_not_assign_to res.object
-                should_redirect_to res.denied.redirect
-                should_set_the_flash_to res.denied.flash
-              else
-                should_assign_to res.object          
-                should_respond_with :success
-                should_render_template :show
-                should_not_set_the_flash
-              end
-            end
-          end
-
-          def make_edit_html_tests(res)
-            context "on GET to #{controller_name_from_class}#edit" do
-              setup do
-                @record = get_existing_record(res)
-                parent_params = make_parent_params(res, @record)
-                get :edit, parent_params.merge({ res.identifier => @record.to_param })          
-              end
-        
-              if res.denied.actions.include?(:edit)
-                should_not_assign_to res.object
-                should_redirect_to res.denied.redirect
-                should_set_the_flash_to res.denied.flash
-              else
-                should_assign_to res.object                    
-                should_respond_with :success
-                should_render_template :edit
-                should_not_set_the_flash
-                should_render_a_form
-                should "set @#{res.object} to requested instance" do
-                  assert_equal @record, assigns(res.object)
-                end
-              end
-            end
-          end
-
-          def make_index_html_tests(res)
-            context "on GET to #{controller_name_from_class}#index" do
-              setup do
-                record = get_existing_record(res) rescue nil
-                parent_params = make_parent_params(res, record)
-                get(:index, parent_params)          
-              end
-
-              if res.denied.actions.include?(:index)
-                should_not_assign_to res.object.to_s.pluralize
-                should_redirect_to res.denied.redirect
-                should_set_the_flash_to res.denied.flash          
-              else
-                should_respond_with :success
-                should_assign_to res.object.to_s.pluralize
-                should_render_template :index
-                should_not_set_the_flash
-              end
-            end
-          end
-
-          def make_new_html_tests(res)
-            context "on GET to #{controller_name_from_class}#new" do
-              setup do
-                record = get_existing_record(res) rescue nil
-                parent_params = make_parent_params(res, record)
-                get(:new, parent_params)          
-              end
-
-              if res.denied.actions.include?(:new)
-                should_not_assign_to res.object
-                should_redirect_to res.denied.redirect
-                should_set_the_flash_to res.denied.flash
-              else
-                should_respond_with :success
-                should_assign_to res.object
-                should_not_set_the_flash
-                should_render_template :new
-                should_render_a_form
-              end
-            end
-          end
-
-          def make_destroy_html_tests(res)
-            context "on DELETE to #{controller_name_from_class}#destroy" do
-              setup do
-                @record = get_existing_record(res)
-                parent_params = make_parent_params(res, @record)
-                delete :destroy, parent_params.merge({ res.identifier => @record.to_param })
-              end
-        
-              if res.denied.actions.include?(:destroy)
-                should_redirect_to res.denied.redirect
-                should_set_the_flash_to res.denied.flash
-          
-                should "not destroy record" do
-                  assert_nothing_raised { assert @record.reload }
-                end
-              else
-                should_set_the_flash_to res.destroy.flash
-                if res.destroy.redirect.is_a? Symbol
-                  should_respond_with res.destroy.redirect
-                else
-                  should_redirect_to res.destroy.redirect
-                end
-
-                should "destroy record" do
-                  assert_raises(::ActiveRecord::RecordNotFound, "@#{res.object} was not destroyed.") do
-                    @record.reload
-                  end
-                end
-              end
-            end
-          end
-
-          def make_create_html_tests(res)
-            context "on POST to #{controller_name_from_class}#create with #{res.create.params.inspect}" do
-              setup do
-                record = get_existing_record(res) rescue nil
-                parent_params = make_parent_params(res, record)
-                @count = res.klass.count
-                post :create, parent_params.merge(res.object => res.create.params)
-              end
-        
-              if res.denied.actions.include?(:create)
-                should_redirect_to res.denied.redirect
-                should_set_the_flash_to res.denied.flash
-                should_not_assign_to res.object
-          
-                should "not create new record" do
-                  assert_equal @count, res.klass.count
-                end          
-              else
-                should_assign_to res.object
-                should_set_the_flash_to res.create.flash
-                if res.create.redirect.is_a? Symbol
-                  should_respond_with res.create.redirect
-                else
-                  should_redirect_to res.create.redirect
-                end
-
-                should "not have errors on @#{res.object}" do
-                  assert_equal [], pretty_error_messages(assigns(res.object)), "@#{res.object} has errors:"            
-                end
-              end      
-            end
-          end
-
-          def make_update_html_tests(res)
-            context "on PUT to #{controller_name_from_class}#update with #{res.create.params.inspect}" do
-              setup do
-                @record = get_existing_record(res)
-                parent_params = make_parent_params(res, @record)
-                put :update, parent_params.merge(res.identifier => @record.to_param, res.object => res.update.params)
-              end
-
-              if res.denied.actions.include?(:update)
-                should_not_assign_to res.object
-                should_redirect_to res.denied.redirect
-                should_set_the_flash_to res.denied.flash
-              else
-                should_assign_to res.object
-                should_set_the_flash_to(res.update.flash)
-                if res.update.redirect.is_a? Symbol
-                  should_respond_with res.update.redirect
-                else
-                  should_redirect_to res.update.redirect
-                end
-                
-                should "not have errors on @#{res.object}" do
-                  assert_equal [], pretty_error_messages(assigns(res.object)), "@#{res.object} has errors:"
-                end
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end