@@ -21,14 +21,14 @@ begin desc "Run all specs in spec directory (excluding plugin specs)" Spec::Rake::SpecTask.new(:spec => spec_prereq) do |t| t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""] - t.spec_files = FileList['spec/**/*_spec.rb'] + t.spec_files = FileList['spec/**/*/*_spec.rb'] end namespace :spec do desc "Run all specs in spec directory with RCov (excluding plugin specs)" Spec::Rake::SpecTask.new(:rcov) do |t| t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""] - t.spec_files = FileList['spec/**/*_spec.rb'] + t.spec_files = FileList['spec/**/*/*_spec.rb'] t.rcov = true t.rcov_opts = lambda do IO.readlines("#{RAILS_ROOT}/spec/rcov.opts").map {|l| l.chomp.split " "}.flatten @@ -38,13 +38,13 @@ begin desc "Print Specdoc for all specs (excluding plugin specs)" Spec::Rake::SpecTask.new(:doc) do |t| t.spec_opts = ["--format", "specdoc", "--dry-run"] - t.spec_files = FileList['spec/**/*_spec.rb'] + t.spec_files = FileList['spec/**/*/*_spec.rb'] end desc "Print Specdoc for all plugin examples" Spec::Rake::SpecTask.new(:plugin_doc) do |t| t.spec_opts = ["--format", "specdoc", "--dry-run"] - t.spec_files = FileList['vendor/plugins/**/spec/**/*_spec.rb'].exclude('vendor/plugins/rspec/*') + t.spec_files = FileList['vendor/plugins/**/spec/**/*/*_spec.rb'].exclude('vendor/plugins/rspec/*') end [:models, :controllers, :views, :helpers, :lib].each do |sub| @@ -58,14 +58,14 @@ begin desc "Run the code examples in vendor/plugins (except RSpec's own)" Spec::Rake::SpecTask.new(:plugins => spec_prereq) do |t| t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""] - t.spec_files = FileList['vendor/plugins/**/spec/**/*_spec.rb'].exclude('vendor/plugins/rspec/*').exclude("vendor/plugins/rspec-rails/*") + t.spec_files = FileList['vendor/plugins/**/spec/**/*/*_spec.rb'].exclude('vendor/plugins/rspec/*').exclude("vendor/plugins/rspec-rails/*") end namespace :plugins do desc "Runs the examples for rspec_on_rails" Spec::Rake::SpecTask.new(:rspec_on_rails) do |t| t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""] - t.spec_files = FileList['vendor/plugins/rspec-rails/spec/**/*_spec.rb'] + t.spec_files = FileList['vendor/plugins/rspec-rails/spec/**/*/*_spec.rb'] end end generators/rspec/templates/rspec.rake @@ -3,9 +3,9 @@ module Rails class GeneratedAttribute def default_value @default_value ||= case type - when :int, :integer then "\"1\"" - when :float then "\"1.5\"" - when :decimal then "\"9.99\"" + when :int, :integer then "1" + when :float then "1.5" + when :decimal then "9.99" when :datetime, :timestamp, :time then "Time.now" when :date then "Date.today" when :string, :text then "\"value for #{@name}\"" generators/rspec_default_values.rb @@ -1,6 +1,6 @@ require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper') -<% output_attributes = attributes.reject{|attribute| attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) } -%> +<% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%> describe "/<%= table_name %>/edit.<%= default_file_extension %>" do include <%= controller_class_name %>Helper generators/rspec_scaffold/templates/edit_erb_spec.rb @@ -1,6 +1,6 @@ require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper') -<% output_attributes = attributes.reject{|attribute| attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) } -%> +<% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%> describe "/<%= table_name %>/index.<%= default_file_extension %>" do include <%= controller_class_name %>Helper @@ -21,7 +21,7 @@ describe "/<%= table_name %>/index.<%= default_file_extension %>" do it "should render list of <%= table_name %>" do render "/<%= table_name %>/index.<%= default_file_extension %>" <% for attribute in output_attributes -%> - response.should have_tag("tr>td", <%= attribute.default_value %>, 2) + response.should have_tag("tr>td", <%= attribute.default_value %>.to_s, 2) <% end -%> end end generators/rspec_scaffold/templates/index_erb_spec.rb @@ -1,6 +1,6 @@ require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper') -<% output_attributes = attributes.reject{|attribute| attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) } -%> +<% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%> describe "/<%= table_name %>/new.<%= default_file_extension %>" do include <%= controller_class_name %>Helper generators/rspec_scaffold/templates/new_erb_spec.rb @@ -1,6 +1,6 @@ require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper') -<% output_attributes = attributes.reject{|attribute| attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) } -%> +<% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%> describe "/<%= table_name %>/show.<%= default_file_extension %>" do include <%= controller_class_name %>Helper before(:each) do @@ -16,7 +16,7 @@ describe "/<%= table_name %>/show.<%= default_file_extension %>" do it "should render attributes in <p>" do render "/<%= table_name %>/show.<%= default_file_extension %>" <% for attribute in output_attributes -%> - response.should have_text(/<%= Regexp.escape(attribute.default_value)[1..-2]%>/) + response.should have_text(/<%= Regexp.escape(attribute.default_value).gsub(/^"|"$/, '')%>/) <% end -%> end end generators/rspec_scaffold/templates/show_erb_spec.rb @@ -1,6 +1,11 @@ silence_warnings { RAILS_ENV = "test" } -require_dependency 'application' +begin + require_dependency 'application_controller' +rescue MissingSourceFile + require_dependency 'application' +end + require 'action_controller/test_process' require 'action_controller/integration' require 'active_record/fixtures' if defined?(ActiveRecord::Base) lib/spec/rails.rb @@ -8,26 +8,21 @@ module Spec module Rails module Example - class RailsExampleGroup < Test::Unit::TestCase - - # Rails >= r8570 uses setup/teardown_fixtures explicitly - # However, Rails >= r8664 extracted these out to use ActiveSupport::Callbacks. - # The latter case is handled at the TestCase level, in interop/testcase.rb - unless ActiveSupport.const_defined?(:Callbacks) and self.include?(ActiveSupport::Callbacks) - before(:each) do - setup_fixtures if self.respond_to?(:setup_fixtures) - end - after(:each) do - teardown_fixtures if self.respond_to?(:teardown_fixtures) - end + if ActiveSupport.const_defined?(:TestCase) + class RailsExampleGroup < ActiveSupport::TestCase + include ActionController::Assertions::SelectorAssertions end - + else + class RailsExampleGroup < Test::Unit::TestCase + end + end + + class RailsExampleGroup include Spec::Rails::Matchers include Spec::Rails::Mocks - Spec::Example::ExampleGroupFactory.default(self) - end + end end end lib/spec/rails/example/rails_example_group.rb @@ -1,8 +1,13 @@ require 'spec/example/configuration' +require 'test_help' + begin module Spec module Example class Configuration + + TEST_CASE = ActiveSupport.const_defined?(:TestCase) ? ActiveSupport::TestCase : Test::Unit::TestCase + # Rails 1.2.3 does a copy of the @inheritable_attributes to the subclass when the subclass is # created. This causes an ordering issue when setting state on Configuration because the data is # already copied. @@ -10,7 +15,7 @@ module Spec # @inheritable_attributes updated. # TODO: BT - When we no longer support Rails 1.2.3, we can remove this functionality EXAMPLE_GROUP_CLASSES = [ - ::Test::Unit::TestCase, + TEST_CASE, ::Spec::Rails::Example::RailsExampleGroup, ::Spec::Rails::Example::FunctionalExampleGroup, ::Spec::Rails::Example::ControllerExampleGroup, @@ -26,7 +31,7 @@ module Spec end def use_transactional_fixtures - Test::Unit::TestCase.use_transactional_fixtures + TEST_CASE.use_transactional_fixtures end def use_transactional_fixtures=(value) EXAMPLE_GROUP_CLASSES.each do |example_group| @@ -35,7 +40,7 @@ module Spec end def use_instantiated_fixtures - Test::Unit::TestCase.use_instantiated_fixtures + TEST_CASE.use_instantiated_fixtures end def use_instantiated_fixtures=(value) EXAMPLE_GROUP_CLASSES.each do |example_group| @@ -44,7 +49,7 @@ module Spec end def fixture_path - Test::Unit::TestCase.fixture_path + TEST_CASE.fixture_path end def fixture_path=(path) EXAMPLE_GROUP_CLASSES.each do |example_group| @@ -53,7 +58,7 @@ module Spec end def global_fixtures - ::Test::Unit::TestCase.fixture_table_names + TEST_CASE.fixture_table_names end def global_fixtures=(fixtures) EXAMPLE_GROUP_CLASSES.each do |example_group| lib/spec/rails/extensions/spec/example/configuration.rb @@ -9,18 +9,18 @@ module Spec end describe "#use_transactional_fixtures" do - it "should return Test::Unit::TestCase.use_transactional_fixtures" do - config.use_transactional_fixtures.should == Test::Unit::TestCase.use_transactional_fixtures + it "should return #{Spec::Example::Configuration::TEST_CASE}.use_transactional_fixtures" do + config.use_transactional_fixtures.should == Spec::Example::Configuration::TEST_CASE.use_transactional_fixtures end - it "should set Test::Unit::TestCase.use_transactional_fixtures to false" do + it "should set #{Spec::Example::Configuration::TEST_CASE}.use_transactional_fixtures to false" do Configuration::EXAMPLE_GROUP_CLASSES.each do |example_group| example_group.should_receive(:use_transactional_fixtures=).with(false) end config.use_transactional_fixtures = false end - it "should set Test::Unit::TestCase.use_transactional_fixtures to true" do + it "should set #{Spec::Example::Configuration::TEST_CASE}.use_transactional_fixtures to true" do Configuration::EXAMPLE_GROUP_CLASSES.each do |example_group| example_group.should_receive(:use_transactional_fixtures=).with(true) end @@ -29,18 +29,18 @@ module Spec end describe "#use_instantiated_fixtures" do - it "should return Test::Unit::TestCase.use_transactional_fixtures" do - config.use_instantiated_fixtures.should == Test::Unit::TestCase.use_instantiated_fixtures + it "should return #{Spec::Example::Configuration::TEST_CASE}.use_transactional_fixtures" do + config.use_instantiated_fixtures.should == Spec::Example::Configuration::TEST_CASE.use_instantiated_fixtures end - it "should set Test::Unit::TestCase.use_instantiated_fixtures to false" do + it "should set #{Spec::Example::Configuration::TEST_CASE}.use_instantiated_fixtures to false" do Configuration::EXAMPLE_GROUP_CLASSES.each do |example_group| example_group.should_receive(:use_instantiated_fixtures=).with(false) end config.use_instantiated_fixtures = false end - it "should set Test::Unit::TestCase.use_instantiated_fixtures to true" do + it "should set #{Spec::Example::Configuration::TEST_CASE}.use_instantiated_fixtures to true" do Configuration::EXAMPLE_GROUP_CLASSES.each do |example_group| example_group.should_receive(:use_instantiated_fixtures=).with(true) end spec/rails/example/configuration_spec.rb UPGRADE ed8d8a2a7fe3cb53293d7ca96a5a8866ec0b10d7 ad1e2f01ebec7abeb5e2a889f5078bee60a4f6cc Ian White ian.w.white@gmail.com http://github.com/ianwhite/rspec-rails/commit/210068a725858708616a135ebbd3d5467d87fb97 210068a725858708616a135ebbd3d5467d87fb97 2008-12-10T18:13:32-08:00 2008-12-10T18:13:32-08:00 Merge branch 'master' of git://github.com/dchelimsky/rspec-rails Conflicts: lib/spec/rails.rb 8b1ee36bfd1c596c8ec0985078998c5745cfd760 Ian White ian.w.white@gmail.com