Skip to content
This repository was archived by the owner on Nov 30, 2024. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rspec/rspec-core
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.4.1
Choose a base ref
...
head repository: rspec/rspec-core
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v3.4.2
Choose a head ref
  • 13 commits
  • 25 files changed
  • 4 contributors

Commits on Jan 6, 2016

  1. Configuration menu
    Copy the full SHA
    c02103c View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2016

  1. Merge pull request #2146 from rspec/fix-specs-on-mri-2.3

    Fix failing specs caused by $SAFE incompatibility on MRI 2.3
    JonRowe committed Jan 7, 2016
    Configuration menu
    Copy the full SHA
    ddf7724 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #2149 from rspec/remove-nokogiri

    Remove nokogiri development dependency
    Conflicts:
    	rspec-core.gemspec
    yujinakayama authored and JonRowe committed Jan 7, 2016
    Configuration menu
    Copy the full SHA
    1a7c8db View commit details
    Browse the repository at this point in the history
  3. Ignore test coverage for SecurityError section in Metadata#relative_path

    MRI 2.3 has only $SAFE level 1, so File.expand_path('.') does not raise
    SecurityError since the '.' is not tainted.
    yujinakayama authored and JonRowe committed Jan 7, 2016
    Configuration menu
    Copy the full SHA
    ee4436e View commit details
    Browse the repository at this point in the history
  4. Pass explicitly tainted object in SecurityError test

    ... because MRI 2.3 does not have $SAFE level to mark every object as
    tainted.
    yujinakayama authored and JonRowe committed Jan 7, 2016
    Configuration menu
    Copy the full SHA
    6ba1c8b View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    43fb5fe View commit details
    Browse the repository at this point in the history
  6. Run expectation outside of $SAFE 1+ environment

    ... because the matcher may be autoloaded if it's used first time in the
    process and raises SecurityError.
    yujinakayama authored and JonRowe committed Jan 7, 2016
    Configuration menu
    Copy the full SHA
    16797b1 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #2153 from rspec/update-travis-build-scripts-2016-…

    …01-06-for-3-4-maintenance
    
    Updates from rspec-dev (2016-01-06)
    JonRowe committed Jan 7, 2016
    Configuration menu
    Copy the full SHA
    68e5805 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2016

  1. Ensure execution result timing is populated

    In the case where RSpec does not handle an error (e.g. SystemExit), we
    still want to capture the example timing data to not break profiling
    information that may get generated via `--profile`.
    
    Fixes #2142
    soulcutter authored and myronmarston committed Jan 26, 2016
    Configuration menu
    Copy the full SHA
    038261e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7a8a24f View commit details
    Browse the repository at this point in the history
  3. Fix --drb option to not list DRb connection error as exception cause.

    If we start the spec run in a `rescue` block, ruby will set the
    rescued exception to be the cause of all exceptions that occur
    during the run.
    myronmarston committed Jan 26, 2016
    Configuration menu
    Copy the full SHA
    1ec9e67 View commit details
    Browse the repository at this point in the history
  4. Make syntax highlighting work when the coderay gem is installed but n…

    …ot on your path.
    
    Apparently, `::Kernel.require` is _only_ ruby's built-in require
    (based on the `$LOAD_PATH`) and does not get the enhanced capabilities
    of rubygems when rubygems is loaded. Rubygems only monkey patches
    `::Kernel#require`, not `::Kernel.require`.
    
    Originally, I had used `::Kernel.require` to load coderay to make
    it easier to stub `require` to simulate coderay not being available,
    as it allowed me to treat coderay as a collaborator. Using bare
    `require` instead forces me to stub the object-under-test, which is
    a bit smelly, but it fixes things so that you can get syntax
    highlighting without using something like bundler to manage your
    project and setup load paths.
    
    Compare:
    
    $ ruby -rubygems -e "p method(:require).source_location"
    ["/Users/myron/.rubies/ruby-2.1.5/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb", 38]
    $ ruby -rubygems -e "p ::Kernel.method(:require).source_location"
    nil
    myronmarston committed Jan 26, 2016
    Configuration menu
    Copy the full SHA
    b8d41eb View commit details
    Browse the repository at this point in the history
  5. 3.4.2 release.

    myronmarston committed Jan 26, 2016
    Configuration menu
    Copy the full SHA
    7013d2d View commit details
    Browse the repository at this point in the history
Loading