thoughtbot-shoulda 2.10.2 → 2.11.1

data/test/other/convert_to_should_syntax_test.rb

@@ -41,7 +41,7 @@ class ConvertToShouldSyntaxTest < ActiveSupport::TestCase # :nodoc:
 
     end
   EOS
-  
+
   FIXTURE_PATH = "./convert_to_should_syntax_fixture.dat"
 
   RUBY = ENV['RUBY'] || 'ruby'

data/test/other/helpers_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require 'test_helper'
 require 'action_mailer'
 require 'mocha'
 
@@ -93,13 +93,6 @@ class HelpersTest < ActiveSupport::TestCase # :nodoc:
       should_change("the number of elements", :to => 4) { @a.length }
       should_change("the first element", :by => 0) { @a[0] }
       should_not_change("the first element") { @a[0] }
-
-      # tests for deprecated behavior
-      should_change "@a.length", :by => 1
-      should_change "@a.length", :from => 3
-      should_change "@a.length", :to => 4
-      should_change "@a[0]", :by => 0
-      should_not_change "@a[0]"
     end
 
     context "after replacing it with an array of strings" do
@@ -113,14 +106,6 @@ class HelpersTest < ActiveSupport::TestCase # :nodoc:
       should_change("the second element", :from => 2, :to => "b") { @a[1] }
       should_change("the third element", :from => /\d/, :to => /\w/) { @a[2] }
       should_change("the last element", :to => String) { @a[3] }
-
-      # tests for deprecated behavior
-      should_change "@a.length", :by => 3
-      should_change "@a.length", :from => 3, :to => 6, :by => 3
-      should_change "@a[0]"
-      should_change "@a[1]", :from => 2, :to => "b"
-      should_change "@a[2]", :from => /\d/, :to => /\w/
-      should_change "@a[3]", :to => String
     end
   end
 
@@ -148,16 +133,6 @@ class HelpersTest < ActiveSupport::TestCase # :nodoc:
     should "accept a class as the first argument" do
       assert_good_value User, :email, "good@example.com"
     end
-
-    context "with an instance variable" do
-      setup do
-        @product = Product.new(:tangible => true)
-      end
-
-      should "use that instance variable" do
-        assert_good_value Product, :price, "9999", /included/
-      end
-    end
   end
 
   context "assert_bad_value" do
@@ -184,16 +159,6 @@ class HelpersTest < ActiveSupport::TestCase # :nodoc:
     should "accept a class as the first argument" do
       assert_bad_value User, :email, "bad"
     end
-
-    context "with an instance variable" do
-      setup do
-        @product = Product.new(:tangible => true)
-      end
-
-      should "use that instance variable" do
-        assert_bad_value Product, :price, "0", /included/
-      end
-    end
   end
 
   context "a matching matcher" do
@@ -274,6 +239,18 @@ class HelpersTest < ActiveSupport::TestCase # :nodoc:
     end
   end
 
+  should "assign context to a support matching on assert_accepts" do
+    matcher = stub('matcher', :matches? => true)
+    matcher.expects(:in_context).with(self)
+    assert_accepts matcher, nil
+  end
+
+  should "assign context to a support matching on assert_rejects" do
+    matcher = stub('matcher', :matches? => false)
+    matcher.expects(:in_context).with(self)
+    assert_rejects matcher, nil
+  end
+
   context "given one treat exists and one post exists" do
     setup do
       Treat.create!

data/test/other/private_helpers_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require 'test_helper'
 
 class PrivateHelpersTest < ActiveSupport::TestCase # :nodoc:
   include Shoulda::Private
@@ -22,7 +22,7 @@ class PrivateHelpersTest < ActiveSupport::TestCase # :nodoc:
         get_options!(args, :one)
       end
     end
-    
+
     should "return single wanted option" do
       args = [:a, :b, {:class => Object}]
       klass = get_options!(args,:class)

data/test/other/should_test.rb

@@ -1,14 +1,14 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require 'test_helper'
 
 class ShouldTest < ActiveSupport::TestCase # :nodoc:
   should "be able to define a should statement outside of a context" do
     assert true
   end
-  
+
   should "see the name of my class as ShouldTest" do
     assert_equal "ShouldTest", self.class.name
   end
-  
+
   def self.should_see_class_methods
     should "be able to see class methods" do
       assert true
@@ -27,13 +27,13 @@ class ShouldTest < ActiveSupport::TestCase # :nodoc:
 
   def self.should_see_blah
     should "see @blah through a macro" do
-      assert @blah 
+      assert @blah
     end
   end
 
   def self.should_not_see_blah
     should "not see @blah through a macro" do
-      assert_nil @blah 
+      assert_nil @blah
     end
   end
 
@@ -75,12 +75,12 @@ class ShouldTest < ActiveSupport::TestCase # :nodoc:
     setup do
       @blah = "blah"
     end
-    
+
     should "have @blah == 'blah'" do
       assert_equal "blah", @blah
     end
     should_see_blah
-    
+
     should "have name set right" do
       assert_match(/^test: Context with setup block/, self.to_s)
     end
@@ -89,11 +89,11 @@ class ShouldTest < ActiveSupport::TestCase # :nodoc:
       setup do
         @blah = "#{@blah} twice"
       end
-      
+
       should "be named correctly" do
         assert_match(/^test: Context with setup block and a subcontext should be named correctly/, self.to_s)
       end
-      
+
       should "run the setup methods in order" do
         assert_equal @blah, "blah twice"
       end
@@ -105,7 +105,7 @@ class ShouldTest < ActiveSupport::TestCase # :nodoc:
     setup do
       @blah = "foo"
     end
-    
+
     should "have @blah == 'foo'" do
       assert_equal "foo", @blah
     end
@@ -115,7 +115,7 @@ class ShouldTest < ActiveSupport::TestCase # :nodoc:
     end
     should_see_blah
   end
-  
+
   should_eventually "pass, since it's a should_eventually" do
     flunk "what?"
   end
@@ -152,7 +152,7 @@ class ShouldTest < ActiveSupport::TestCase # :nodoc:
       should "be good" do; end
       should "another" do; end
     end
-    
+
     names = context.shoulds.map {|s| s[:name]}
     assert_equal ["another", "be good"], names.sort
   end
@@ -164,7 +164,7 @@ class ShouldTest < ActiveSupport::TestCase # :nodoc:
       setup    do; "setup";    end
       teardown do; "teardown"; end
     end
-    
+
     assert_equal "setup",    context.setup_blocks.first.call
     assert_equal "teardown", context.teardown_blocks.first.call
   end

data/test/{model_builder.rb → rails2_model_builder.rb}

@@ -1,7 +1,11 @@
-class ActiveSupport::TestCase  
+class ActiveSupport::TestCase
+
+  TMP_VIEW_PATH =
+    File.expand_path(File.join(File.dirname(__FILE__), 'rails2_root', 'tmp', 'views')).freeze
+
   def create_table(table_name, &block)
     connection = ActiveRecord::Base.connection
-    
+
     begin
       connection.execute("DROP TABLE IF EXISTS #{table_name}")
       connection.create_table(table_name, &block)
@@ -45,6 +49,14 @@ class ActiveSupport::TestCase
     define_model_class(class_name, &block)
   end
 
+  def define_mailer(name, paths, &block)
+    class_name = name.to_s.pluralize.classify
+    klass = define_constant(class_name, ActionMailer::Base, &block)
+
+    paths.each {|path| create_view("#{name}/#{path}", "<%= @message %>")}
+    klass.template_root = TMP_VIEW_PATH
+  end
+
   def define_controller(class_name, &block)
     class_name = class_name.to_s
     class_name << 'Controller' unless class_name =~ /Controller$/
@@ -60,25 +72,35 @@ class ActiveSupport::TestCase
     new_routes.draw(&block)
   end
 
-  def build_response(&block)
+  def build_response(opts = {}, &block)
+    action = opts[:action] || 'example'
     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'
+    klass.class_eval { define_method(action, &block) }
+    define_routes do |map|
+      map.connect 'examples', :controller => 'examples', :action => action
     end
 
+    create_view("examples/#{action}.html.erb", "abc")
+    klass.view_paths = [TMP_VIEW_PATH]
+
     @controller = klass.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
-    get :example
+    get action
 
     @controller
   end
 
+  def create_view(path, contents)
+    full_path = File.join(TMP_VIEW_PATH, path)
+    FileUtils.mkdir_p(File.dirname(full_path))
+    File.open(full_path, 'w') { |file| file.write(contents) }
+  end
+
   def teardown_with_models
     if @defined_constants
-      @defined_constants.each do |class_name| 
+      @defined_constants.each do |class_name|
         Object.send(:remove_const, class_name)
       end
     end
@@ -99,6 +121,8 @@ class ActiveSupport::TestCase
       @replaced_routes.reload!
     end
 
+    FileUtils.rm_rf(TMP_VIEW_PATH)
+
     teardown_without_models
   end
   alias_method :teardown_without_models, :teardown

data/test/{rails_root → rails2_root}/app/controllers/application_controller.rb

@@ -2,9 +2,6 @@
 # Likewise, all the methods added will be available for all controllers.
 
 class ApplicationController < ActionController::Base
-  # Pick a unique cookie name to distinguish our session data from others'
-  session :session_key => '_rails_root_session_id'
-  
   def ensure_logged_in
     unless session[:logged_in]
       respond_to do |accepts|

data/test/rails2_root/app/models/flea.rb

@@ -0,0 +1,11 @@
+class Flea < ActiveRecord::Base
+  has_and_belongs_to_many :dogs
+
+  after_create :send_notification
+
+  private
+
+  def send_notification
+    Notifier.deliver_the_email
+  end
+end

data/test/rails2_root/app/models/notifier.rb

@@ -0,0 +1,8 @@
+class Notifier < ActionMailer::Base
+  def the_email
+    from       "do-not-reply@example.com"
+    recipients "myself@me.com"
+    subject    "This is spam"
+    body       :body => "Every email is spam."
+  end
+end

data/test/{rails_root → rails2_root}/app/models/post.rb

@@ -7,6 +7,6 @@ class Post < ActiveRecord::Base
 
   validates_uniqueness_of :title
   validates_presence_of :title
-  validates_presence_of :body, :message => 'Seriously...  wtf'
+  validates_presence_of :body, :message => 'Seriously, wtf'
   validates_numericality_of :user_id
 end

data/test/rails2_root/app/views/notifier/the_email.html.erb

@@ -0,0 +1 @@
+<%= @body %>

data/test/{rails_root → rails2_root}/config/database.yml

@@ -1,4 +1,4 @@
 test:
   :adapter: sqlite3
   # :dbfile: db/sqlite3.db
-  :dbfile: ":memory:"
+  :database: ":memory:"

data/test/{rails_root → rails2_root}/config/environment.rb

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

data/test/rails2_root/config/environments/test.rb

@@ -0,0 +1,23 @@
+# Settings specified here will take precedence over those in config/environment.rb
+
+# The test environment is used exclusively to run your application's
+# test suite.  You never need to work with it otherwise.  Remember that
+# your test database is "scratch space" for the test suite and is wiped
+# and recreated between test runs.  Don't rely on the data there!
+config.cache_classes = true
+
+# Log error messages when you accidentally call methods on nil.
+config.whiny_nils = true
+
+# Show full error reports and disable caching
+config.action_controller.consider_all_requests_local = true
+config.action_controller.perform_caching             = false
+config.action_view.cache_template_loading            = true
+
+# Disable request forgery protection in test environment
+config.action_controller.allow_forgery_protection    = false
+
+# Tell Action Mailer not to deliver emails to the real world.
+# The :test delivery method accumulates sent emails in the
+# ActionMailer::Base.deliveries array.
+config.action_mailer.delivery_method = :test