Skip to content

Commit b52742a

Browse files
committed
Merge pull request #67 from skalee/rspec-3
Add RSpec 3 support
2 parents ecf8d3a + e1060e2 commit b52742a

File tree

5 files changed

+23
-1
lines changed

5 files changed

+23
-1
lines changed

.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
language: ruby
22
branches: master
3+
gemfile:
4+
- gemfiles/rspec2.gemfile
5+
- gemfiles/rspec3.gemfile
36
rvm:
47
- 1.9.2
58
- 1.9.3

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ gemspec
44

55
group :test do
66
gem "cucumber", "~> 1.1", ">= 1.1.1"
7+
gem "rspec", "~> 2.0"
78
gem "rake", "~> 10.0"
89
end

gemfiles/rspec2.gemfile

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
source "https://rubygems.org"
2+
3+
gemspec :path => '..'
4+
5+
group :test do
6+
gem "cucumber", "~> 1.1", ">= 1.1.1"
7+
gem "rspec", "~> 2.0"
8+
gem "rake", "~> 10.0"
9+
end

gemfiles/rspec3.gemfile

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
source "https://rubygems.org"
2+
3+
gemspec :path => '..'
4+
5+
group :test do
6+
gem "cucumber", "~> 1.1", ">= 1.1.1"
7+
gem "rspec", ">= 3.0.0.beta1", "< 4.0"
8+
gem "rake", "~> 10.0"
9+
end

json_spec.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
1212
gem.license = "MIT"
1313

1414
gem.add_dependency "multi_json", "~> 1.0"
15-
gem.add_dependency "rspec", "~> 2.0"
15+
gem.add_dependency "rspec-expectations", ">= 2.0", "< 4.0"
1616

1717
gem.add_development_dependency "bundler", "~> 1.0"
1818

0 commit comments

Comments
 (0)