Merge pull request #2898 from rspec/local-build-tweaks

Tweaks to prevent flakeyness with local builds

Author: JonRowe

Gemfile

@@ -20,8 +20,7 @@ group :documentation do
   gem 'github-markup', :platform => :mri
 end
 
-# Until 1.13.2 is released due to Rubygems usage
-gem 'ffi', '~> 1.12.0'
+gem 'ffi', '~> 1.15.0'
 
 gem "jruby-openssl", platforms: :jruby
 

spec/integration/spec_file_load_errors_spec.rb

@@ -19,6 +19,7 @@
 
     RSpec.configure do |c|
       c.filter_gems_from_backtrace "gems/aruba"
+      c.filter_gems_from_backtrace "gems/bundler"
       c.backtrace_exclusion_patterns << %r{/rspec-core/spec/} << %r{rspec_with_simplecov}
       c.failure_exit_code = failure_exit_code
       c.error_exit_code = error_exit_code

spec/integration/suite_hooks_errors_spec.rb

@@ -21,6 +21,7 @@
 
     RSpec.configure do |c|
       c.filter_gems_from_backtrace "gems/aruba"
+      c.filter_gems_from_backtrace "gems/bundler"
       c.backtrace_exclusion_patterns << %r{/rspec-core/spec/} << %r{rspec_with_simplecov}
       c.failure_exit_code = failure_exit_code
       c.error_exit_code = error_exit_code

spec/rspec/core/formatters/base_text_formatter_spec.rb

@@ -200,15 +200,15 @@ def run_all_and_dump_failures
       it "does not show the error class" do
         group.example("example name") { expect("this").to eq("that") }
         run_all_and_dump_failures
-        expect(formatter_output.string).not_to match(/RSpec/m)
+        expect(formatter_output.string).not_to match(/RSpec::/m)
       end
     end
 
     context "with a failed message expectation (rspec-mocks)" do
       it "does not show the error class" do
         group.example("example name") { expect("this").to receive("that") }
         run_all_and_dump_failures
-        expect(formatter_output.string).not_to match(/RSpec/m)
+        expect(formatter_output.string).not_to match(/RSpec::/m)
       end
     end
 

spec/support/formatter_support.rb

@@ -33,6 +33,7 @@ def run_rspec_with_formatter(formatter, options={})
 
     runner = RSpec::Core::Runner.new(options)
     configuration = runner.configuration
+    configuration.filter_gems_from_backtrace "gems/bundler"
     configuration.backtrace_formatter.exclusion_patterns << /rspec_with_simplecov/
     configuration.backtrace_formatter.inclusion_patterns = []
 
@@ -41,6 +42,7 @@ def run_rspec_with_formatter(formatter, options={})
     runner.run(err, out)
     out.string
   end
+  RUN_LINE = __LINE__ - 3
 
   def normalize_durations(output)
     output.gsub(/(?:\d+ minutes? )?\d+(?:\.\d+)?(s| seconds?)/) do |dur|
@@ -66,7 +68,7 @@ def expected_summary_output_for_example_specs
       |
       |       (compared using ==)
       |     # ./spec/rspec/core/resources/formatter_specs.rb:18:in `block (3 levels) in <top (required)>'
-      |     # ./spec/support/formatter_support.rb:41:in `run_rspec_with_formatter'
+      |     # ./spec/support/formatter_support.rb:#{RUN_LINE}:in `run_rspec_with_formatter'
       |     # ./spec/support/formatter_support.rb:3:in `run_example_specs_with_formatter'
       |     # ./spec/support/sandboxing.rb:16:in `block (3 levels) in <top (required)>'
       |     # ./spec/support/sandboxing.rb:7:in `block (2 levels) in <top (required)>'
@@ -86,7 +88,7 @@ def expected_summary_output_for_example_specs
       |
       |       (compared using ==)
       |     # ./spec/rspec/core/resources/formatter_specs.rb:37:in `block (2 levels) in <top (required)>'
-      |     # ./spec/support/formatter_support.rb:41:in `run_rspec_with_formatter'
+      |     # ./spec/support/formatter_support.rb:#{RUN_LINE}:in `run_rspec_with_formatter'
       |     # ./spec/support/formatter_support.rb:3:in `run_example_specs_with_formatter'
       |     # ./spec/support/sandboxing.rb:16:in `block (3 levels) in <top (required)>'
       |     # ./spec/support/sandboxing.rb:7:in `block (2 levels) in <top (required)>'
@@ -117,7 +119,7 @@ def expected_summary_output_for_example_specs
       |       foo
       |     # (erb):1:in `<main>'
       |     # ./spec/rspec/core/resources/formatter_specs.rb:50:in `block (2 levels) in <top (required)>'
-      |     # ./spec/support/formatter_support.rb:41:in `run_rspec_with_formatter'
+      |     # ./spec/support/formatter_support.rb:#{RUN_LINE}:in `run_rspec_with_formatter'
       |     # ./spec/support/formatter_support.rb:3:in `run_example_specs_with_formatter'
       |     # ./spec/support/sandboxing.rb:16:in `block (3 levels) in <top (required)>'
       |     # ./spec/support/sandboxing.rb:7:in `block (2 levels) in <top (required)>'