Merge pull request #2470 from rspec/update-to-mainline-ammeter-to-support-rspec-4

Update ammeter dependency to support RSpec 4

Author: pirj

rspec-rails.gemspec

@@ -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

spec/spec_helper.rb

@@ -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