Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rspec-rails.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Gem::Specification.new do |s|
end
end

s.add_development_dependency 'ammeter', '~> 1.1.2'
s.add_development_dependency 'ammeter', '~> 1.1.5'
s.add_development_dependency 'aruba', '~> 0.14.12'
s.add_development_dependency 'cucumber', '~> 1.3.5'
end
4 changes: 0 additions & 4 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,4 @@ def self.run_all(reporter = nil)
example.run
end
end

# TODO: Remove once https://github.com/alexrothenberg/ammeter/pull/64 is merged
# Work around ammeter's incompatibility with RSpec 4
config.include Ammeter::RSpec::Rails::GeneratorExampleGroup, type: :generator
end