shoulda 2.10.1 → 2.10.2

data/test/rails_root/db/migrate/20090506203502_create_profiles.rb

@@ -0,0 +1,12 @@
+class CreateProfiles < ActiveRecord::Migration
+  def self.up
+    create_table :profiles do |t|
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :profiles
+  end
+end

data/test/rails_root/db/migrate/20090506203536_create_registrations.rb

@@ -0,0 +1,14 @@
+class CreateRegistrations < ActiveRecord::Migration
+  def self.up
+    create_table :registrations do |t|
+      t.integer :user_id
+      t.integer :profile_id
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :registrations
+  end
+end

data/test/rails_root/db/migrate/20090513104502_create_cats.rb

@@ -0,0 +1,12 @@
+class CreateCats < ActiveRecord::Migration
+  def self.up
+    create_table :cats do |t|
+      t.column :owner_id, :integer
+      t.column :address_id, :integer
+    end
+  end
+
+  def self.down
+    drop_table :cats
+  end
+end

data/test/rails_root/test/shoulda_macros/custom_macro.rb

@@ -2,5 +2,5 @@ module CustomMacro
   def custom_macro
   end
 end
-Test::Unit::TestCase.extend(CustomMacro)
+ActiveSupport::TestCase.extend(CustomMacro)
 

data/test/rails_root/vendor/gems/gem_with_macro-0.0.1/shoulda_macros/gem_macro.rb

@@ -2,5 +2,5 @@ module GemMacro
   def gem_macro
   end
 end
-Test::Unit::TestCase.extend(GemMacro)
+ActiveSupport::TestCase.extend(GemMacro)
 

data/test/rails_root/vendor/plugins/plugin_with_macro/shoulda_macros/plugin_macro.rb

@@ -2,5 +2,5 @@ module PluginMacro
   def plugin_macro
   end
 end
-Test::Unit::TestCase.extend(PluginMacro)
+ActiveSupport::TestCase.extend(PluginMacro)
 

data/test/rspec_test.rb

@@ -8,7 +8,7 @@ rescue LoadError => exception
   puts "RSpec integration was not tested because RSpec is not available"
 else
 
-  class RspecTest < Test::Unit::TestCase
+  class RspecTest < ActiveSupport::TestCase
 
     SHOULDA_ROOT =
       File.expand_path(File.join(File.dirname(__FILE__), '..')).freeze

data/test/test_helper.rb

@@ -16,17 +16,10 @@ ActiveRecord::Migration.verbose = false
 ActiveRecord::Migrator.migrate("#{RAILS_ROOT}/db/migrate")
 
 # Setup the fixtures path
-Test::Unit::TestCase.fixture_path = File.join(File.dirname(__FILE__), "fixtures")
-
-class Test::Unit::TestCase #:nodoc:
-  def create_fixtures(*table_names)
-    if block_given?
-      Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names) { yield }
-    else
-      Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names)
-    end
-  end
+ActiveSupport::TestCase.fixture_path =
+  File.join(File.dirname(__FILE__), "fixtures")
 
+class ActiveSupport::TestCase #:nodoc:
   self.use_transactional_fixtures = false
   self.use_instantiated_fixtures  = false
 end

data/test/unit/address_test.rb

@@ -1,10 +1,10 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class AddressTest < Test::Unit::TestCase
+class AddressTest < ActiveSupport::TestCase
   fixtures :all
 
   should_belong_to :addressable
   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
+  should_validate_numericality_of :zip
 end

data/test/unit/cat_test.rb

@@ -0,0 +1,7 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class Pets::CatTest < ActiveSupport::TestCase
+  should_belong_to :owner
+  should_belong_to :address, :dependent => :destroy
+  should_validate_presence_of :owner_id
+end

data/test/unit/dog_test.rb

@@ -1,10 +1,9 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class Pets::DogTest < Test::Unit::TestCase
+class Pets::DogTest < ActiveSupport::TestCase
   should_belong_to :user
   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
+  should_validate_presence_of :owner_id, :treats, :fleas
 end

data/test/unit/flea_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class FleaTest < Test::Unit::TestCase
+class FleaTest < ActiveSupport::TestCase
   should_have_and_belong_to_many :dogs
 end
 

data/test/unit/post_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class PostTest < Test::Unit::TestCase
+class PostTest < ActiveSupport::TestCase
   fixtures :all
 
   should_belong_to :user
@@ -8,7 +8,7 @@ class PostTest < Test::Unit::TestCase
   should_have_many :tags, :through => :taggings
   should_have_many :through_tags, :through => :taggings
 
-  should_require_unique_attributes :title
+  should_validate_uniqueness_of :title
   should_validate_presence_of :body, :message => /wtf/
   should_validate_presence_of :title
   should_validate_numericality_of :user_id

data/test/unit/product_test.rb

@@ -2,9 +2,7 @@ require File.dirname(__FILE__) + '/../test_helper'
 
 class ProductTest < ActiveSupport::TestCase
   context "An intangible product" do
-    setup do
-      @product = Product.new(:tangible => false)
-    end
+    subject { Product.new(:tangible => false) }
 
     should_validate_presence_of :title
     should_not_allow_values_for :size, "22"
@@ -13,9 +11,7 @@ class ProductTest < ActiveSupport::TestCase
   end
 
   context "A tangible product" do
-    setup do
-      @product = Product.new(:tangible => true)
-    end
+    subject { Product.new(:tangible => true) }
 
     should_validate_presence_of :price
     should_ensure_value_in_range :price, 1..9999

data/test/unit/tag_test.rb

@@ -1,12 +1,12 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class TagTest < Test::Unit::TestCase
+class TagTest < ActiveSupport::TestCase
   should_have_many :taggings, :dependent => :destroy
   should_have_many :posts
 
   should_ensure_length_at_least :name, 2
 
-  should_protect_attributes :secret
+  should_not_allow_mass_assignment_of :secret
   should_allow_mass_assignment_of :name
 
   should_fail do

data/test/unit/tagging_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class TaggingTest < Test::Unit::TestCase
+class TaggingTest < ActiveSupport::TestCase
   should_belong_to :post
   should_belong_to :tag
 end

data/test/unit/user_test.rb

@@ -1,10 +1,11 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class UserTest < Test::Unit::TestCase
+class UserTest < ActiveSupport::TestCase
   fixtures :all
 
   should_have_many :posts
   should_have_many :dogs
+  should_have_many :cats
 
   should_have_many :friendships
   should_have_many :friends
@@ -12,15 +13,15 @@ class UserTest < Test::Unit::TestCase
   should_have_one :address
   should_have_one :address, :dependent => :destroy
 
-  should_have_indices :email, :name
+  should_have_db_indices :email, :name
   should_have_index :age
-  should_have_index [:email, :name], :unique => true
-  should_have_index :age, :unique => false
+  should_have_db_index [:email, :name], :unique => true
+  should_have_db_index :age, :unique => false
 
   should_fail do
-    should_have_index :phone
-    should_have_index :email, :unique => false
-    should_have_index :age, :unique => true
+    should_have_db_index :phone
+    should_have_db_index :email, :unique => false
+    should_have_db_index :age, :unique => true
   end
 
   should_have_named_scope :old,       :conditions => "age > 50"
@@ -37,6 +38,9 @@ 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_allow_values_for :age, 1, 10, 99
+  should_not_allow_values_for :age, "a", "-"
+  should_not_allow_values_for :ssn, "a", 1234567890
   should_ensure_length_in_range :email, 1..100
   should_ensure_value_in_range :age, 1..100, :low_message  => /greater/,
                                              :high_message => /less/
@@ -56,7 +60,6 @@ class UserTest < Test::Unit::TestCase
   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_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"
@@ -67,4 +70,11 @@ class UserTest < Test::Unit::TestCase
   should_fail do
     should_not_allow_mass_assignment_of :name, :age
   end
+
+  should_have_one :profile, :through => :registration
+
+  should_fail do
+    should_have_one :profile, :through => :interview
+    should_have_one :address, :through => :registration
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shoulda
 version: !ruby/object:Gem::Version 
-  version: 2.10.1
+  version: 2.10.2
 platform: ruby
 authors: 
 - Tammer Saleh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-05 00:00:00 -05:00
+date: 2009-07-15 00:00:00 -04:00
 default_executable: convert_to_should_syntax
 dependencies: []
 
@@ -28,7 +28,6 @@ files:
 - Rakefile
 - README.rdoc
 - bin/convert_to_should_syntax
-- lib/shoulda/action_controller/helpers.rb
 - lib/shoulda/action_controller/macros.rb
 - lib/shoulda/action_controller/matchers/assign_to_matcher.rb
 - lib/shoulda/action_controller/matchers/filter_param_matcher.rb
@@ -53,10 +52,11 @@ files:
 - 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_db_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_format_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
@@ -94,10 +94,11 @@ files:
 - 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_db_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_format_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
@@ -116,7 +117,7 @@ files:
 - test/other/helpers_test.rb
 - test/other/private_helpers_test.rb
 - test/other/should_test.rb
-- test/rails_root/app/controllers/application.rb
+- test/rails_root/app/controllers/application_controller.rb
 - test/rails_root/app/controllers/posts_controller.rb
 - test/rails_root/app/controllers/users_controller.rb
 - test/rails_root/app/helpers/application_helper.rb
@@ -125,9 +126,12 @@ files:
 - test/rails_root/app/models/address.rb
 - test/rails_root/app/models/flea.rb
 - test/rails_root/app/models/friendship.rb
+- test/rails_root/app/models/pets/cat.rb
 - 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/profile.rb
+- test/rails_root/app/models/registration.rb
 - test/rails_root/app/models/tag.rb
 - test/rails_root/app/models/tagging.rb
 - test/rails_root/app/models/treat.rb
@@ -161,9 +165,10 @@ files:
 - 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/migrate/20090506203502_create_profiles.rb
+- test/rails_root/db/migrate/20090506203536_create_registrations.rb
+- test/rails_root/db/migrate/20090513104502_create_cats.rb
 - test/rails_root/db/schema.rb
-- test/rails_root/log/sqlite3.log
-- test/rails_root/log/test.log
 - test/rails_root/public/404.html
 - test/rails_root/public/422.html
 - test/rails_root/public/500.html
@@ -176,6 +181,7 @@ files:
 - test/rspec_test.rb
 - test/test_helper.rb
 - test/unit/address_test.rb
+- test/unit/cat_test.rb
 - test/unit/dog_test.rb
 - test/unit/flea_test.rb
 - test/unit/friendship_test.rb
@@ -212,7 +218,7 @@ requirements: []
 rubyforge_project: shoulda
 rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Making tests easy on the fingers and eyes
 test_files: []
 

data/lib/shoulda/action_controller/helpers.rb

@@ -1,47 +0,0 @@
-module Shoulda # :nodoc:
-  module ActionController # :nodoc:
-    module Helpers # :nodoc:
-      private # :enddoc:
-
-      SPECIAL_INSTANCE_VARIABLES = %w{
-        _cookies
-        _flash
-        _headers
-        _params
-        _request
-        _response
-        _session
-        action_name
-        before_filter_chain_aborted
-        cookies
-        flash
-        headers
-        ignore_missing_templates
-        logger
-        params
-        request
-        request_origin
-        response
-        session
-        template
-        template_class
-        template_root
-        url
-        variables_added
-      }.map(&:to_s)
-
-      def instantiate_variables_from_assigns(*names, &blk)
-        old = {}
-        names = (@response.template.assigns.keys - SPECIAL_INSTANCE_VARIABLES) if names.empty?
-        names.each do |name|
-          old[name] = instance_variable_get("@#{name}")
-          instance_variable_set("@#{name}", assigns(name.to_sym))
-        end
-        blk.call
-        names.each do |name|
-          instance_variable_set("@#{name}", old[name])
-        end
-      end
-    end
-  end
-end