Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

passing features with test_matchers required in RSpec suites

  • Loading branch information...
commit ce48f562977a4a93309f7693b6841bf4faba1e57 1 parent b638fd0
@croaky croaky authored
View
7 CHANGELOG.md
@@ -1,3 +1,10 @@
+0.11.2 (unreleased)
+-------------------
+
+* Rails 3.1.rc compatible. (Prem Sichanugrist and Dan Croak)
+* Cucumber features no longer require password. (Dan Croak)
+* No more Clearance shoulda_macros. Instead providing RSpec- and Test::Unit-compliant test matchers (sign_in, sign_in_as, should deny_access, etc). (Dan Croak)
+
0.11.1
-------------------
View
4 Gemfile
@@ -13,5 +13,5 @@ gem "database_cleaner"
gem "rspec-rails", "~> 2.6.0"
gem "launchy"
gem "mocha"
-gem "appraisal", "~> 0.3.5"
-gem "aruba", "~> 0.3.6"
+gem "appraisal", :git => "git://github.com/thoughtbot/appraisal.git"
+gem "aruba", "~> 0.4.2"
View
26 Gemfile.lock
@@ -1,4 +1,13 @@
GIT
+ remote: git://github.com/thoughtbot/appraisal.git
+ revision: f8029181543b4bc4bdea03735a3b1e558fd66501
+ specs:
+ appraisal (0.3.5)
+ aruba (~> 0.4.2)
+ bundler
+ rake
+
+GIT
remote: git://github.com/thoughtbot/diesel.git
revision: f68a990573e2684bb4645a90876603de0a772b69
specs:
@@ -41,15 +50,15 @@ GEM
activemodel (= 3.0.9)
activesupport (= 3.0.9)
activesupport (3.0.9)
- appraisal (0.3.5)
- aruba (~> 0.3.6)
- bundler
- rake
arel (2.0.10)
- aruba (0.3.7)
+ aruba (0.4.3)
+ bcat (>= 0.6.1)
childprocess (>= 0.1.9)
- cucumber (>= 0.10.5)
+ cucumber (>= 0.10.7)
+ rdiscount (>= 1.6.8)
rspec (>= 2.6.0)
+ bcat (0.6.1)
+ rack (~> 1.0)
builder (2.1.2)
capybara (1.0.0)
mime-types (>= 1.16)
@@ -118,6 +127,7 @@ GEM
rdoc (~> 3.4)
thor (~> 0.14.4)
rake (0.9.2)
+ rdiscount (1.6.8)
rdoc (3.7)
rspec (2.6.0)
rspec-core (~> 2.6.0)
@@ -151,8 +161,8 @@ PLATFORMS
ruby
DEPENDENCIES
- appraisal (~> 0.3.5)
- aruba (~> 0.3.6)
+ appraisal!
+ aruba (~> 0.4.2)
capybara (= 1.0.0)
cucumber-rails (= 1.0.0)
database_cleaner
View
11 README.md
@@ -17,7 +17,7 @@ Help
Installation
------------
-Clearance is a Rails engine for Rails 3.
+Clearance is a Rails engine for Rails 3. It is currently tested against Rails 3.0.9 and Rails 3.1.0.rc4.
Include the gem in your Gemfile:
@@ -108,6 +108,15 @@ Then run your tests!
rake
+Optional test matchers
+----------------------
+
+Clearance comes with test matchers that are compatible with RSpec and Test::Unit.
+
+To use them, require the test matchers. For example, in spec/support/clearance.rb:
+
+ require 'clearance/shoulda_matchers'
+
Extensions
----------
View
6 Rakefile
@@ -25,9 +25,3 @@ Cucumber::Rake::Task.new(:cucumber) do |t|
t.fork = true
t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'progress')]
end
-
-<<<<<<< HEAD
-=======
-desc "Default: run the specs and cucumber features"
-task :default => [:spec, :cucumber]
->>>>>>> upgrading test dependencies, converting shoulda_macros to
View
6 gemfiles/3.0.9.gemfile
@@ -10,9 +10,9 @@ gem "capybara", "1.0.0"
gem "factory_girl_rails"
gem "shoulda-matchers", :git=>"git://github.com/thoughtbot/shoulda-matchers.git"
gem "database_cleaner"
-gem "rspec-rails"
+gem "rspec-rails", "~> 2.6.0"
gem "launchy"
gem "mocha"
-gem "appraisal", "~> 0.3.5"
-gem "aruba", "~> 0.3.6"
+gem "appraisal", :git=>"git://github.com/thoughtbot/appraisal.git"
+gem "aruba", "~> 0.4.2"
View
28 gemfiles/3.0.9.gemfile.lock
@@ -1,4 +1,13 @@
GIT
+ remote: git://github.com/thoughtbot/appraisal.git
+ revision: f8029181543b4bc4bdea03735a3b1e558fd66501
+ specs:
+ appraisal (0.3.5)
+ aruba (~> 0.4.2)
+ bundler
+ rake
+
+GIT
remote: git://github.com/thoughtbot/diesel.git
revision: 9a7955eadd3e2f445ecf3d2d58edfc2a5e80a20b
specs:
@@ -41,15 +50,15 @@ GEM
activemodel (= 3.0.9)
activesupport (= 3.0.9)
activesupport (3.0.9)
- appraisal (0.3.5)
- aruba (~> 0.3.6)
- bundler
- rake
arel (2.0.10)
- aruba (0.3.7)
+ aruba (0.4.3)
+ bcat (>= 0.6.1)
childprocess (>= 0.1.9)
- cucumber (>= 0.10.5)
+ cucumber (>= 0.10.7)
+ rdiscount (>= 1.6.8)
rspec (>= 2.6.0)
+ bcat (0.6.1)
+ rack (~> 1.0)
builder (2.1.2)
capybara (1.0.0)
mime-types (>= 1.16)
@@ -118,6 +127,7 @@ GEM
rdoc (~> 3.4)
thor (~> 0.14.4)
rake (0.9.2)
+ rdiscount (1.6.8)
rdoc (3.6.1)
rspec (2.6.0)
rspec-core (~> 2.6.0)
@@ -151,8 +161,8 @@ PLATFORMS
ruby
DEPENDENCIES
- appraisal (~> 0.3.5)
- aruba (~> 0.3.6)
+ appraisal!
+ aruba (~> 0.4.2)
capybara (= 1.0.0)
cucumber-rails (= 1.0.0)
database_cleaner
@@ -161,6 +171,6 @@ DEPENDENCIES
launchy
mocha
rails (= 3.0.9)
- rspec-rails
+ rspec-rails (~> 2.6.0)
shoulda-matchers!
sqlite3
View
6 gemfiles/3.1.0.rc4.gemfile
@@ -10,11 +10,11 @@ gem "capybara", "1.0.0"
gem "factory_girl_rails"
gem "shoulda-matchers", :git=>"git://github.com/thoughtbot/shoulda-matchers.git"
gem "database_cleaner"
-gem "rspec-rails"
+gem "rspec-rails", "~> 2.6.0"
gem "launchy"
gem "mocha"
-gem "appraisal", "~> 0.3.5"
-gem "aruba", "~> 0.3.6"
+gem "appraisal", :git=>"git://github.com/thoughtbot/appraisal.git"
+gem "aruba", "~> 0.4.2"
gem "sass-rails"
gem "coffee-script"
gem "uglifier"
View
28 gemfiles/3.1.0.rc4.gemfile.lock
@@ -1,4 +1,13 @@
GIT
+ remote: git://github.com/thoughtbot/appraisal.git
+ revision: f8029181543b4bc4bdea03735a3b1e558fd66501
+ specs:
+ appraisal (0.3.5)
+ aruba (~> 0.4.2)
+ bundler
+ rake
+
+GIT
remote: git://github.com/thoughtbot/diesel.git
revision: 9a7955eadd3e2f445ecf3d2d58edfc2a5e80a20b
specs:
@@ -44,15 +53,15 @@ GEM
activesupport (= 3.1.0.rc4)
activesupport (3.1.0.rc4)
multi_json (~> 1.0)
- appraisal (0.3.5)
- aruba (~> 0.3.6)
- bundler
- rake
arel (2.1.1)
- aruba (0.3.7)
+ aruba (0.4.3)
+ bcat (>= 0.6.1)
childprocess (>= 0.1.9)
- cucumber (>= 0.10.5)
+ cucumber (>= 0.10.7)
+ rdiscount (>= 1.6.8)
rspec (>= 2.6.0)
+ bcat (0.6.1)
+ rack (~> 1.0)
bcrypt-ruby (2.1.4)
builder (3.0.0)
capybara (1.0.0)
@@ -136,6 +145,7 @@ GEM
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (0.9.2)
+ rdiscount (1.6.8)
rdoc (3.6.1)
rspec (2.6.0)
rspec-core (~> 2.6.0)
@@ -183,8 +193,8 @@ PLATFORMS
ruby
DEPENDENCIES
- appraisal (~> 0.3.5)
- aruba (~> 0.3.6)
+ appraisal!
+ aruba (~> 0.4.2)
capybara (= 1.0.0)
coffee-script
cucumber-rails (= 1.0.0)
@@ -195,7 +205,7 @@ DEPENDENCIES
launchy
mocha
rails (= 3.1.0.rc4)
- rspec-rails
+ rspec-rails (~> 2.6.0)
sass-rails
shoulda-matchers!
sqlite3
View
2  lib/clearance.rb
@@ -1,6 +1,4 @@
require 'clearance/configuration'
require 'clearance/authentication'
require 'clearance/user'
-
require 'clearance/engine'
-require 'clearance/test_matchers'
View
2  spec/spec_helper.rb
@@ -11,6 +11,8 @@
require 'diesel/testing'
require 'rspec/rails'
+require 'clearance/test_matchers'
+
Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
RSpec.configure do |config|
Please sign in to comment.
Something went wrong with that request. Please try again.