Move into the Matchers namespace

kscollective · Jan 19, 2011 · c482786 · c482786
1 parent edaa699
commit c482786
Show file tree

Hide file tree

Showing 94 changed files with 2,577 additions and 2,518 deletions.
diff --git a/Rakefile b/Rakefile
@@ -7,7 +7,7 @@ require 'rspec/core/rake_task'
 require 'cucumber/rake/task'
 
 $LOAD_PATH.unshift("lib")
-require 'shoulda/version'
+require 'shoulda/matchers/version'
 
 Rake::RDocTask.new { |rdoc|
   rdoc.rdoc_dir = 'doc'
@@ -31,7 +31,7 @@ RSpec::Core::RakeTask.new(:coverage) do |t|
   t.pattern = "spec/**/*_spec.rb"
 end
 
-eval("$specification = begin; #{IO.read('shoulda.gemspec')}; end")
+eval("$specification = begin; #{IO.read('shoulda-matchers.gemspec')}; end")
 Rake::GemPackageTask.new $specification do |pkg|
   pkg.need_tar = true
   pkg.need_zip = true

diff --git a/features/rails_integration.feature b/features/rails_integration.feature
@@ -33,7 +33,7 @@ Feature: integrate with Rails
 
   Scenario: generate a rails application and use matchers in Test::Unit
     When I configure the application to use shoulda-context
-    And I configure the application to use "shoulda" from this project
+    And I configure the application to use "shoulda-matchers" from this project
     And I write to "test/unit/user_test.rb" with:
       """
       require 'test_helper'
@@ -63,7 +63,7 @@ Feature: integrate with Rails
 
   Scenario: generate a rails application and use matchers in Rspec
     When I configure the application to use rspec-rails
-    And I configure the application to use "shoulda" from this project
+    And I configure the application to use "shoulda-matchers" from this project
     And I run the rspec generator
     And I write to "spec/models/user_spec.rb" with:
       """

diff --git a/lib/shoulda-matchers.rb b/lib/shoulda-matchers.rb
@@ -0,0 +1,8 @@
+require 'shoulda/matchers/version'
+
+if defined?(RSpec)
+  require 'shoulda/matchers/integrations/rspec'
+else
+  require 'shoulda/matchers/integrations/test_unit'
+end
+
diff --git a/lib/shoulda.rb b/lib/shoulda.rb
diff --git a/lib/shoulda/action_controller.rb b/lib/shoulda/action_controller.rb
diff --git a/lib/shoulda/action_controller/assign_to_matcher.rb b/lib/shoulda/action_controller/assign_to_matcher.rb
diff --git a/lib/shoulda/action_controller/filter_param_matcher.rb b/lib/shoulda/action_controller/filter_param_matcher.rb
diff --git a/lib/shoulda/action_controller/redirect_to_matcher.rb b/lib/shoulda/action_controller/redirect_to_matcher.rb
diff --git a/lib/shoulda/action_controller/render_template_matcher.rb b/lib/shoulda/action_controller/render_template_matcher.rb