Skip to content

Commit 1b86407

Browse files
authored
Merge pull request #59 from rspec/move-dev-dependencies-to-gemfile
Move dev dependencies to Gemfile
2 parents e9cd834 + 7b0bd52 commit 1b86407

File tree

3 files changed

+8
-27
lines changed

3 files changed

+8
-27
lines changed

.rubocop.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,12 @@ AllCops:
1010
- tmp/**/*
1111
- bundle/**/*
1212

13-
# TODO: Remove
14-
Gemspec/DevelopmentDependencies:
15-
Enabled: false
16-
1713
Gemspec/DeprecatedAttributeAssignment:
1814
Enabled: false
1915

2016
Gemspec/RequiredRubyVersion:
2117
Enabled: false
2218

23-
# TODO: Remove
24-
Gemspec/RubyVersionGlobalsUsage:
25-
Enabled: false
26-
2719
Layout/LineLength:
2820
Max: 120
2921

Gemfile

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,16 @@ gemspec
1212
end
1313
end
1414

15+
# Development dependencies
16+
cucumber_version = RUBY_VERSION < '2.0.0' ? '< 3' : '>= 3'
17+
gem 'cucumber', cucumber_version
18+
19+
gem 'rake'
1520
gem 'rubocop'
1621

22+
gem 'aruba', '~> 0.4.11'
23+
gem 'ZenTest', '~> 4.11.2'
24+
1725
### deps for rdoc.info
1826
group :documentation do
1927
gem 'github-markup', '1.0.0'
@@ -66,7 +74,3 @@ else
6674
end
6775

6876
gem "i18n", '< 0.7.0' if RUBY_VERSION < '1.9.3'
69-
70-
if RUBY_VERSION < '2.0.0'
71-
gem 'cucumber', "< 3"
72-
end

rspec-activemodel-mocks.gemspec

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,4 @@ Gem::Specification.new do |s|
3636
s.add_runtime_dependency('activemodel', [">= 3.0"])
3737
s.add_runtime_dependency('activesupport', [">= 3.0"])
3838
s.add_runtime_dependency('rspec-mocks', [">= 2.99", "< 4.0"])
39-
40-
if RUBY_VERSION.to_f < 1.9 || RUBY_VERSION == '1.9.2'
41-
s.add_development_dependency "rake", "~> 10.0.0"
42-
elsif RUBY_VERSION.to_f < 2
43-
s.add_development_dependency "rake", "~> 11.0.0"
44-
elsif RUBY_VERSION.to_f < 2.3
45-
s.add_development_dependency "rake", "~> 12.3.2"
46-
else
47-
s.add_development_dependency "rake", "~> 13.0.0"
48-
end
49-
50-
s.add_development_dependency('activerecord', [">= 3.0"])
51-
s.add_development_dependency 'aruba', '~> 0.4.11'
52-
s.add_development_dependency 'cucumber', '>= 1.3'
53-
s.add_development_dependency 'ZenTest', '~> 4.11.2'
5439
end

0 commit comments

Comments
 (0)