Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
  • 6 commits
  • 10 files changed
  • 0 commit comments
  • 2 contributors
View
1  .travis.yml
@@ -1,4 +1,3 @@
rvm:
- - 1.8.7
- 1.9.3
- 2.0.0
View
6 Appraisals
@@ -13,3 +13,9 @@ appraise '3.2' do
gem 'jquery-rails'
gem 'sass-rails'
end
+
+appraise '4.0' do
+ gem 'rails', '4.0.0.rc1'
+ gem 'jquery-rails'
+ gem 'sass-rails', '4.0.0.rc1'
+end
View
10 gemfiles/3.0.gemfile.lock
@@ -1,7 +1,7 @@
PATH
remote: /Users/rmcgeary/work/oss/shoulda-context
specs:
- shoulda-context (1.0.2)
+ shoulda-context (1.1.1)
GEM
remote: http://rubygems.org/
@@ -33,7 +33,7 @@ GEM
activemodel (= 3.0.17)
activesupport (= 3.0.17)
activesupport (3.0.17)
- appraisal (0.5.1)
+ appraisal (0.5.2)
bundler
rake
arel (2.0.10)
@@ -41,13 +41,13 @@ GEM
erubis (2.6.6)
abstract (>= 1.0.0)
i18n (0.5.0)
- json (1.7.7)
- mail (2.2.19)
+ json (1.8.0)
+ mail (2.2.20)
activesupport (>= 2.3.6)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.21)
+ mime-types (1.23)
mocha (0.9.12)
polyglot (0.3.3)
rack (1.2.8)
View
19 gemfiles/3.1.gemfile.lock
@@ -1,7 +1,7 @@
PATH
remote: /Users/rmcgeary/work/oss/shoulda-context
specs:
- shoulda-context (1.0.2)
+ shoulda-context (1.1.1)
GEM
remote: http://rubygems.org/
@@ -34,23 +34,23 @@ GEM
activesupport (= 3.1.8)
activesupport (3.1.8)
multi_json (>= 1.0, < 1.3)
- appraisal (0.5.1)
+ appraisal (0.5.2)
bundler
rake
arel (2.2.3)
builder (3.0.4)
erubis (2.7.0)
- hike (1.2.1)
+ hike (1.2.2)
i18n (0.6.4)
jquery-rails (2.2.1)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
- json (1.7.7)
+ json (1.8.0)
mail (2.3.3)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.21)
+ mime-types (1.23)
mocha (0.9.12)
multi_json (1.2.0)
polyglot (0.3.3)
@@ -81,19 +81,18 @@ GEM
rake (10.0.4)
rdoc (3.12.2)
json (~> 1.4)
- sass (3.2.7)
- sass-rails (3.1.7)
+ sass (3.2.9)
+ sass-rails (3.1.0)
actionpack (~> 3.1.0)
railties (~> 3.1.0)
- sass (>= 3.1.10)
- tilt (~> 1.3.2)
+ sass (>= 3.1.4)
sprockets (2.0.4)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
test-unit (2.1.2)
thor (0.14.6)
- tilt (1.3.6)
+ tilt (1.4.1)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
View
18 gemfiles/3.2.gemfile.lock
@@ -1,7 +1,7 @@
PATH
remote: /Users/rmcgeary/work/oss/shoulda-context
specs:
- shoulda-context (1.0.2)
+ shoulda-context (1.1.1)
GEM
remote: http://rubygems.org/
@@ -33,26 +33,26 @@ GEM
activesupport (3.2.9)
i18n (~> 0.6)
multi_json (~> 1.0)
- appraisal (0.5.1)
+ appraisal (0.5.2)
bundler
rake
arel (3.0.2)
builder (3.0.4)
erubis (2.7.0)
- hike (1.2.1)
+ hike (1.2.2)
i18n (0.6.4)
journey (1.0.4)
jquery-rails (2.2.1)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
- json (1.7.7)
+ json (1.8.0)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.21)
+ mime-types (1.23)
mocha (0.9.12)
- multi_json (1.7.2)
+ multi_json (1.7.3)
polyglot (0.3.3)
rack (1.4.5)
rack-cache (1.2)
@@ -79,7 +79,7 @@ GEM
rake (10.0.4)
rdoc (3.12.2)
json (~> 1.4)
- sass (3.2.7)
+ sass (3.2.9)
sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
@@ -90,8 +90,8 @@ GEM
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
test-unit (2.1.2)
- thor (0.17.0)
- tilt (1.3.6)
+ thor (0.18.1)
+ tilt (1.4.1)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
View
9 gemfiles/4.0.gemfile
@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "4.0.0.rc1"
+gem "jquery-rails"
+gem "sass-rails", "4.0.0.rc1"
+
+gemspec :path=>"../"
View
107 gemfiles/4.0.gemfile.lock
@@ -0,0 +1,107 @@
+PATH
+ remote: /Users/rmcgeary/work/oss/shoulda-context
+ specs:
+ shoulda-context (1.1.1)
+
+GEM
+ remote: http://rubygems.org/
+ specs:
+ actionmailer (4.0.0.rc1)
+ actionpack (= 4.0.0.rc1)
+ mail (~> 2.5.3)
+ actionpack (4.0.0.rc1)
+ activesupport (= 4.0.0.rc1)
+ builder (~> 3.1.0)
+ erubis (~> 2.7.0)
+ rack (~> 1.5.2)
+ rack-test (~> 0.6.2)
+ activemodel (4.0.0.rc1)
+ activesupport (= 4.0.0.rc1)
+ builder (~> 3.1.0)
+ activerecord (4.0.0.rc1)
+ activemodel (= 4.0.0.rc1)
+ activerecord-deprecated_finders (~> 1.0.2)
+ activesupport (= 4.0.0.rc1)
+ arel (~> 4.0.0)
+ activerecord-deprecated_finders (1.0.2)
+ activesupport (4.0.0.rc1)
+ i18n (~> 0.6, >= 0.6.4)
+ minitest (~> 4.2)
+ multi_json (~> 1.3)
+ thread_safe (~> 0.1)
+ tzinfo (~> 0.3.37)
+ appraisal (0.5.2)
+ bundler
+ rake
+ arel (4.0.0)
+ atomic (1.1.9)
+ builder (3.1.4)
+ erubis (2.7.0)
+ hike (1.2.2)
+ i18n (0.6.4)
+ jquery-rails (2.2.1)
+ railties (>= 3.0, < 5.0)
+ thor (>= 0.14, < 2.0)
+ mail (2.5.3)
+ i18n (>= 0.4.0)
+ mime-types (~> 1.16)
+ treetop (~> 1.4.8)
+ mime-types (1.23)
+ minitest (4.7.4)
+ mocha (0.9.12)
+ multi_json (1.7.3)
+ polyglot (0.3.3)
+ rack (1.5.2)
+ rack-test (0.6.2)
+ rack (>= 1.0)
+ rails (4.0.0.rc1)
+ actionmailer (= 4.0.0.rc1)
+ actionpack (= 4.0.0.rc1)
+ activerecord (= 4.0.0.rc1)
+ activesupport (= 4.0.0.rc1)
+ bundler (>= 1.3.0, < 2.0)
+ railties (= 4.0.0.rc1)
+ sprockets-rails (~> 2.0.0.rc4)
+ railties (4.0.0.rc1)
+ actionpack (= 4.0.0.rc1)
+ activesupport (= 4.0.0.rc1)
+ rake (>= 0.8.7)
+ thor (>= 0.18.1, < 2.0)
+ rake (10.0.4)
+ sass (3.2.9)
+ sass-rails (4.0.0.rc1)
+ railties (>= 4.0.0.beta, < 5.0)
+ sass (>= 3.1.10)
+ sprockets-rails (~> 2.0.0.rc0)
+ tilt (~> 1.3)
+ sprockets (2.9.3)
+ hike (~> 1.2)
+ multi_json (~> 1.0)
+ rack (~> 1.0)
+ tilt (~> 1.1, != 1.3.0)
+ sprockets-rails (2.0.0.rc4)
+ actionpack (>= 3.0)
+ activesupport (>= 3.0)
+ sprockets (~> 2.8)
+ test-unit (2.1.2)
+ thor (0.18.1)
+ thread_safe (0.1.0)
+ atomic
+ tilt (1.4.1)
+ treetop (1.4.12)
+ polyglot
+ polyglot (>= 0.3.1)
+ tzinfo (0.3.37)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ appraisal (~> 0.5)
+ jquery-rails
+ mocha (~> 0.9.10)
+ rails (= 4.0.0.rc1)
+ rake
+ sass-rails (= 4.0.0.rc1)
+ shoulda-context!
+ test-unit (~> 2.1.0)
View
8 lib/shoulda/context/assertions.rb
@@ -52,14 +52,14 @@ def assert_accepts(matcher, target, options = {})
end
if matcher.matches?(target)
- assert_block { true }
+ assert { true }
if options[:message]
message = matcher.respond_to?(:failure_message_for_should_not) ? matcher.failure_message_for_should_not : matcher.negative_failure_message
assert_match options[:message], message
end
else
message = matcher.respond_to?(:failure_message_for_should) ? matcher.failure_message_for_should : matcher.failure_message
- assert_block(message) { false }
+ assert(message) { false }
end
end
@@ -73,14 +73,14 @@ def assert_rejects(matcher, target, options = {})
not_match = matcher.respond_to?(:does_not_match?) ? matcher.does_not_match?(target) : !matcher.matches?(target)
if not_match
- assert_block { true }
+ assert { true }
if options[:message]
message = matcher.respond_to?(:failure_message_for_should) ? matcher.failure_message_for_should : matcher.failure_message
assert_match options[:message], message
end
else
message = matcher.respond_to?(:failure_message_for_should_not) ? matcher.failure_message_for_should_not : matcher.negative_failure_message
- assert_block(message) { false }
+ assert(message) { false }
end
end
end
View
2  lib/shoulda/context/version.rb
@@ -1,5 +1,5 @@
module Shoulda
module Context
- VERSION = '1.1.1'.freeze
+ VERSION = '1.1.2'.freeze
end
end
View
2  shoulda-context.gemspec
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
s.require_paths = ["lib"]
s.add_development_dependency("appraisal", "~> 0.5")
- s.add_development_dependency("rails", "3.2.9")
+ s.add_development_dependency("rails", ">= 3.0")
s.add_development_dependency("mocha", "~> 0.9.10")
s.add_development_dependency("rake")
s.add_development_dependency("test-unit", "~> 2.1.0")

No commit comments for this range

Something went wrong with that request. Please try again.