fixing ruby 1.8 error with matcher

TMaYaD · Jun 30, 2011 · 4cf19bb · 4cf19bb
1 parent eaac67b
commit 4cf19bb
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 21 deletions.
diff --git a/gemfiles/3.0.9.gemfile b/gemfiles/3.0.9.gemfile
@@ -2,17 +2,17 @@
 
 source "http://rubygems.org"
 
-gem "rails", "3.0.9"
 gem "sqlite3"
-gem "diesel", :git=>"git://github.com/thoughtbot/diesel.git"
-gem "cucumber-rails", "1.0.0"
-gem "capybara", "1.0.0"
-gem "factory_girl_rails"
+gem "rails", "3.0.9"
 gem "shoulda-matchers", :git=>"git://github.com/thoughtbot/shoulda-matchers.git"
+gem "diesel", :git=>"git://github.com/thoughtbot/diesel.git"
 gem "database_cleaner"
 gem "rspec-rails", "~> 2.6.0"
-gem "launchy"
+gem "aruba", "~> 0.4.2"
+gem "cucumber-rails", "1.0.0"
 gem "mocha"
 gem "appraisal", :git=>"git://github.com/thoughtbot/appraisal.git"
-gem "aruba", "~> 0.4.2"
+gem "capybara", "1.0.0"
+gem "factory_girl_rails"
+gem "launchy"
 
diff --git a/gemfiles/3.1.0.rc4.gemfile b/gemfiles/3.1.0.rc4.gemfile
@@ -2,22 +2,22 @@
 
 source "http://rubygems.org"
 
-gem "rails", "3.1.0.rc4"
+gem "jquery-rails"
+gem "uglifier"
 gem "sqlite3"
-gem "diesel", :git=>"git://github.com/thoughtbot/diesel.git"
-gem "cucumber-rails", "1.0.0"
-gem "capybara", "1.0.0"
-gem "factory_girl_rails"
+gem "rails", "3.1.0.rc4"
+gem "sass-rails"
 gem "shoulda-matchers", :git=>"git://github.com/thoughtbot/shoulda-matchers.git"
+gem "coffee-script"
+gem "diesel", :git=>"git://github.com/thoughtbot/diesel.git"
 gem "database_cleaner"
 gem "rspec-rails", "~> 2.6.0"
-gem "launchy"
-gem "mocha"
-gem "appraisal", :git=>"git://github.com/thoughtbot/appraisal.git"
 gem "aruba", "~> 0.4.2"
-gem "sass-rails"
-gem "coffee-script"
-gem "uglifier"
-gem "jquery-rails"
+gem "cucumber-rails", "1.0.0"
+gem "mocha"
 gem "turn"
+gem "appraisal", :git=>"git://github.com/thoughtbot/appraisal.git"
+gem "capybara", "1.0.0"
+gem "factory_girl_rails"
+gem "launchy"
 
diff --git a/lib/clearance/testing/assertion_error.rb b/lib/clearance/testing/assertion_error.rb
@@ -1,5 +1,5 @@
 module Clearance
-  module Test
+  module Testing
     if RUBY_VERSION > "1.9"
       require 'minitest/unit'
       AssertionError = MiniTest::Assertion

diff --git a/lib/clearance/testing/deny_access_matcher.rb b/lib/clearance/testing/deny_access_matcher.rb
@@ -54,7 +54,7 @@ def redirects_to_url?
             @context.send(:assert_redirected_to, @url)
             @negative_failure_message << "Didn't expect to redirect to #{@url}."
             true
-          rescue Clearance::Test::AssertionError
+          rescue Clearance::Testing::AssertionError
             @failure_message << "Expected to redirect to #{@url} but did not."
             false
           end