shoulda 2.9.1 → 2.9.2

data/test/model_builder.rb

@@ -14,8 +14,10 @@ class Test::Unit::TestCase
     end
   end
 
-  def define_model_class(class_name, &block)
-    klass = Class.new(ActiveRecord::Base)
+  def define_constant(class_name, base, &block)
+    class_name = class_name.to_s.camelize
+
+    klass = Class.new(base)
     Object.const_set(class_name, klass)
 
     klass.class_eval(&block) if block_given?
@@ -26,6 +28,10 @@ class Test::Unit::TestCase
     klass
   end
 
+  def define_model_class(class_name, &block)
+    define_constant(class_name, ActiveRecord::Base, &block)
+  end
+
   def define_model(name, columns = {}, &block)
     class_name = name.to_s.pluralize.classify
     table_name = class_name.tableize
@@ -39,6 +45,37 @@ class Test::Unit::TestCase
     define_model_class(class_name, &block)
   end
 
+  def define_controller(class_name, &block)
+    class_name = class_name.to_s
+    class_name << 'Controller' unless class_name =~ /Controller$/
+    define_constant(class_name, ActionController::Base, &block)
+  end
+
+  def define_routes(&block)
+    @replaced_routes = ActionController::Routing::Routes
+    new_routes = ActionController::Routing::RouteSet.new
+    silence_warnings do
+      ActionController::Routing.const_set('Routes', new_routes)
+    end
+    new_routes.draw(&block)
+  end
+
+  def build_response(&block)
+    klass = define_controller('Examples')
+    block ||= lambda { render :nothing => true }
+    klass.class_eval { define_method(:example, &block) }
+    define_routes do |map| 
+      map.connect 'examples', :controller => 'examples', :action => 'example'
+    end
+
+    @controller = klass.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    get :example
+
+    @controller
+  end
+
   def teardown_with_models
     if @defined_constants
       @defined_constants.each do |class_name| 
@@ -54,6 +91,14 @@ class Test::Unit::TestCase
       end
     end
 
+    if @replaced_routes
+      ActionController::Routing::Routes.clear!
+      silence_warnings do
+        ActionController::Routing.const_set('Routes', @replaced_routes)
+      end
+      @replaced_routes.reload!
+    end
+
     teardown_without_models
   end
   alias_method :teardown_without_models, :teardown

data/test/rails_root/app/models/user.rb

@@ -20,7 +20,8 @@ class User < ActiveRecord::Base
 
   validates_format_of :email, :with => /\w*@\w*.com/
   validates_length_of :email, :in => 1..100
-  validates_inclusion_of :age, :in => 1..100
+  validates_numericality_of :age, :greater_than_or_equal_to => 1,
+                                  :less_than_or_equal_to    => 100
   validates_acceptance_of :eula
   validates_uniqueness_of :email, :scope => :name, :case_sensitive => false
   validates_length_of :ssn, :is => 9, :message => "Social Security Number is not the right length"

data/test/rails_root/config/environment.rb

@@ -1,6 +1,6 @@
 # Specifies gem version of Rails to use when vendor/rails is not present
 old_verbose, $VERBOSE = $VERBOSE, nil
-RAILS_GEM_VERSION = '>= 2.1.0' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '= 2.2.2' unless defined? RAILS_GEM_VERSION
 $VERBOSE = old_verbose
 
 require File.join(File.dirname(__FILE__), 'boot')

data/test/rspec_test.rb

@@ -0,0 +1,207 @@
+require 'test_helper'
+
+begin
+  gem 'rspec'
+  gem 'rspec-rails'
+rescue LoadError => exception
+  puts exception.message
+  puts "RSpec integration was not tested because RSpec is not available"
+else
+
+  class RspecTest < Test::Unit::TestCase
+
+    SHOULDA_ROOT =
+      File.expand_path(File.join(File.dirname(__FILE__), '..')).freeze
+
+    def setup
+      build_gemspec
+    end
+
+    def teardown
+      FileUtils.rm_rf(project_dir)
+      FileUtils.rm_rf("#{shoulda_root}/pkg")
+    end
+
+    should "integrate correctly when using config.gem in test.rb" do
+      create_project
+      insert(rspec_dependencies, "config/environments/test.rb")
+      vendor_gems('test')
+      configure_spec_rails
+      assert_configured
+    end
+
+    should "integrate correctly when using config.gem in environment.rb" do
+      create_project
+      insert(rspec_dependencies,
+             "config/environment.rb",
+             /Rails::Initializer\.run/)
+      vendor_gems('development')
+      configure_spec_rails
+      assert_configured
+    end
+
+    should "integrate correctly when using require in spec_helper" do
+      create_project
+      configure_spec_rails
+      insert(%{gem 'shoulda'; require 'shoulda'},
+             "spec/spec_helper.rb",
+             %{require 'spec/rails'})
+      assert_configured
+    end
+
+    should "integrate correctly when unpacked and required in spec_helper" do
+      create_project
+      configure_spec_rails
+      insert(%{require 'shoulda'},
+             "spec/spec_helper.rb",
+             %{require 'spec/rails'})
+      unpack_gems
+      assert_configured
+    end
+
+    def create_project
+      command "rails #{project_dir}"
+    end
+
+    def vendor_gems(env)
+      project_command "rake gems:unpack RAILS_ENV=#{env}"
+    end
+
+    def unpack_gems
+      FileUtils.mkdir_p "#{project_dir}/vendor/gems"
+      FileUtils.cd "#{project_dir}/vendor/gems" do
+        %w(rspec rspec-rails shoulda).each do |gem|
+          command "gem unpack #{gem}"
+        end
+      end
+
+      insert('config.load_paths += Dir["#{RAILS_ROOT}/vendor/gems/*/lib"]',
+             "config/environment.rb",
+             /Rails::Initializer\.run/)
+    end
+
+    def command(command)
+      output = `GEM_PATH=#{shoulda_root}/pkg #{command} 2>&1`
+      unless $? == 0
+        flunk("Command failed with status #{$?}\n#{command}\n#{output}")
+      end
+      @command_output ||= ''
+      @command_output << output
+      output
+    end
+
+    def project_command(command)
+      result = nil
+      FileUtils.cd project_dir do
+        result = command(command)
+      end
+      result
+    end
+
+    def shoulda_command(command)
+      FileUtils.cd shoulda_root do
+        command(command)
+      end
+    end
+
+    def project_name
+      'example_rails_project'
+    end
+
+    def project_dir
+      File.expand_path(File.join(File.dirname(__FILE__), project_name))
+    end
+
+    def insert(content, path, after = nil)
+      path = File.join(project_dir, path)
+      contents = IO.read(path)
+      if after
+        contents.gsub!(/^(.*#{after}.*)$/, "\\1\n#{content}")
+      else
+        contents << "\n" << content
+      end
+      File.open(path, 'w') {|file| file.write(contents) }
+    end
+
+    def rspec_dependencies
+      return <<-EOS
+        config.gem 'rspec',       :lib => 'spec'
+        config.gem 'rspec-rails', :lib => false
+        config.gem 'shoulda',     :lib => 'shoulda'
+      EOS
+    end
+
+    def configure_spec_rails
+      project_command "script/generate rspec"
+    end
+
+    def assert_configured
+      create_model
+      migrate
+      create_controller
+      assert_spec_passes
+    end
+
+    def create_model
+      project_command "script/generate rspec_model person name:string"
+      insert "validates_presence_of :name",
+             "app/models/person.rb",
+             /class Person/
+      insert "it { should validate_presence_of(:name) }",
+             "spec/models/person_spec.rb",
+             /describe Person do/
+    end
+
+    def create_controller
+      project_command "script/generate rspec_controller people"
+      insert "def index; render :text => 'Hello'; end",
+             "app/controllers/people_controller.rb",
+             /class PeopleController/
+      shoulda_controller_example = <<-EOS
+        describe PeopleController, "on GET index" do
+          integrate_views
+          subject { controller }
+          before(:each) { get :index }
+          it { should respond_with(:success) }
+        end
+      EOS
+      insert shoulda_controller_example,
+             "spec/controllers/people_controller_spec.rb"
+    end
+
+    def migrate
+      project_command "rake db:migrate"
+    end
+
+    def assert_spec_passes
+      result = project_command("rake spec SPEC_OPTS=-fs")
+      assert_match /should require name to be set/, result
+      assert_match /should respond with 200/, result
+    end
+
+    def shoulda_root
+      SHOULDA_ROOT
+    end
+
+    def build_gemspec
+      backup_gemspec do
+        shoulda_command "rake gemspec"
+        shoulda_command "rake gem"
+        shoulda_command "gem install --no-ri --no-rdoc -i pkg pkg/shoulda*.gem"
+      end
+    end
+
+    def backup_gemspec
+      actual = "#{shoulda_root}/shoulda.gemspec"
+      backup = "#{shoulda_root}/backup.gemspec"
+      FileUtils.mv(actual, backup)
+      begin
+        yield
+      ensure
+        FileUtils.mv(backup, actual)
+      end
+    end
+
+  end
+
+end

data/test/unit/user_test.rb

@@ -38,7 +38,16 @@ 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_have_class_methods :find, :destroy
   should_have_instance_methods :email, :age, :email=, :valid?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shoulda
 version: !ruby/object:Gem::Version 
-  version: 2.9.1
+  version: 2.9.2
 platform: ruby
 authors: 
 - Tammer Saleh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-04 00:00:00 -05:00
+date: 2009-03-03 00:00:00 -05:00
 default_executable: convert_to_should_syntax
 dependencies: []
 
@@ -28,8 +28,22 @@ 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
+- 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/assertions.rb
 - lib/shoulda/action_mailer.rb
+- lib/shoulda/action_view/macros.rb
+- lib/shoulda/action_view.rb
 - lib/shoulda/active_record/assertions.rb
 - lib/shoulda/active_record/helpers.rb
 - lib/shoulda/active_record/macros.rb
@@ -52,12 +66,6 @@ files:
 - lib/shoulda/assertions.rb
 - lib/shoulda/autoload_macros.rb
 - lib/shoulda/context.rb
-- 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
@@ -80,19 +88,27 @@ files:
 - test/fixtures/users.yml
 - test/functional/posts_controller_test.rb
 - test/functional/users_controller_test.rb
-- test/matchers/allow_mass_assignment_of_matcher_test.rb
-- test/matchers/allow_value_matcher_test.rb
-- test/matchers/association_matcher_test.rb
-- test/matchers/ensure_inclusion_of_matcher_test.rb
-- test/matchers/ensure_length_of_matcher_test.rb
-- test/matchers/have_db_column_matcher_test.rb
-- test/matchers/have_index_matcher_test.rb
-- test/matchers/have_named_scope_matcher_test.rb
-- test/matchers/have_readonly_attributes_matcher_test.rb
-- test/matchers/validate_acceptance_of_matcher_test.rb
-- test/matchers/validate_numericality_of_matcher_test.rb
-- test/matchers/validate_presence_of_matcher_test.rb
-- test/matchers/validate_uniqueness_of_matcher_test.rb
+- 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/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/autoload_macro_test.rb
 - test/other/context_test.rb
@@ -157,6 +173,7 @@ files:
 - test/rails_root/vendor/gems/gem_with_macro-0.0.1/shoulda_macros/gem_macro.rb
 - 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/address_test.rb
 - test/unit/dog_test.rb
@@ -174,7 +191,6 @@ licenses: []
 post_install_message: 
 rdoc_options: 
 - --line-numbers
-- --inline-source
 - --main
 - README.rdoc
 require_paths: 

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

@@ -1,199 +0,0 @@
-module Shoulda # :nodoc: 
-  module Controller # :nodoc:
-    module HTML # :nodoc: all
-      def self.included(other)
-        other.class_eval do
-          extend 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