Commits on Jul 20, 2016
  1. @JonRowe

    Merge pull request #2300 from rspec/remove_jruby_workaround

    Remove old jruby workaround in our specs
    JonRowe committed on GitHub Jul 20, 2016
  2. @JonRowe

    remove old jruby workaround

    JonRowe committed Jul 20, 2016
Commits on Jul 19, 2016
  1. @JonRowe

    Merge pull request #2293 from rspec/update-travis-build-scripts-2016-…

    …07-14-for-master
    
    Updates from rspec-dev (2016-07-14)
    JonRowe committed on GitHub Jul 20, 2016
  2. @JonRowe

    changelog for #2298

    [skip ci]
    JonRowe committed Jul 20, 2016
  3. @JonRowe

    Merge pull request #2298 from bootstraponline/block_duplicate_with

    Fix block support in example.duplicate_with
    JonRowe committed on GitHub Jul 20, 2016
  4. @bootstraponline

    Fix block support in example.duplicate_with

    Update spec to verify block exists in cloned example
    bootstraponline committed Jul 19, 2016
  5. @JonRowe

    pend broken cucumber features

    JonRowe committed Jul 19, 2016
  6. @JonRowe

    disable simplecov on jruby

    Doesn't seem to work at all on 9.1.2.0
    JonRowe committed Jul 19, 2016
Commits on Jul 18, 2016
  1. @myronmarston

    Merge pull request #2295 from rspec/myron/simplify-metadata-filtering…

    …-further
    
    No need for `!!` here.
    myronmarston committed on GitHub Jul 18, 2016
  2. @myronmarston

    No need for `!!` here.

    myronmarston committed Jul 18, 2016
  3. @JonRowe

    update jruby to 9.1.2.0

    JonRowe committed Jul 18, 2016
  4. @JonRowe

    Merge pull request #2294 from rspec/myron/simplify-metadata-filtering

    Improve and simplify metadata filtering.
    JonRowe committed on GitHub Jul 18, 2016
  5. @myronmarston

    Improve and simplify metadata filtering.

    - Get the value from the metadata hash only once instead of
      multiple times using `metadata[key]`.
    - Try `===` method instead of treating regular expressions
      as special.
    myronmarston committed Jul 17, 2016
Commits on Jul 17, 2016
  1. @JonRowe

    pend certain specs on jruby 9000

    JonRowe committed Jul 15, 2016
Commits on Jul 13, 2016
  1. @JonRowe
  2. @myronmarston

    Merge pull request #2291 from rspec/myron/fix-bug-in-example-finished

    Fill in execution_status before reporting example_finished.
    myronmarston committed on GitHub Jul 13, 2016
  3. @myronmarston
Commits on Jul 8, 2016
  1. @myronmarston

    Merge pull request #2287 from rspec/2278_changelog_and_tidy

    Follow up to #2278
    myronmarston committed on GitHub Jul 7, 2016
  2. @JonRowe
Commits on Jul 7, 2016
  1. @JonRowe

    changelog for #2278

    JonRowe committed Jul 8, 2016
  2. @JonRowe

    Merge pull request #2278 from devonestes/adding-error-message

    Add helpful warning message for shared example groups
    JonRowe committed on GitHub Jul 8, 2016
  3. @devonestes

    Add helpful warning message for shared example groups

    I found myself with a strange warning message not long ago saying the following:
    ```
    WARNING: Shared example group 'a flagger_or_tagger' has been previously defined
    at:
      /Users/devoncestes/esh/IRT/spec/services/shared_examples/flagger_or_tagger_spec.rb:10
    ...and you are now defining it at:
      /Users/devoncestes/esh/IRT/spec/services/shared_examples/flagger_or_tagger_spec.rb:10
    The new definition will overwrite the original one.
    ```
    
    Turns out that this was happening because the file in which we defined our
    shared example group ended in `_spec.rb`, which triggered the Rspec auto
    loading, thus creating the strange warning. I had no idea how ths could happen
    until I opened up an issue and @myronmarston pointed out the error. I figured
    that a helpful warning message that could guide the user to fixing this warning
    themselves might be good to add, so I've done so here!
    devonestes committed Jul 2, 2016
  4. @myronmarston

    Forwardport 3.5.1 release notes.

    [ci skip]
    myronmarston committed Jul 6, 2016
  5. @JonRowe

    Merge pull request #2284 from rspec/myron/pr-2280-followups

    PR 2280 followups
    JonRowe committed on GitHub Jul 7, 2016
  6. @myronmarston
  7. @myronmarston

    Refactor `on_existing_matching_groups`.

    - Use a functional style using recursion instead of
      mutating a `groups` array imperatively. I find a
      functional style easier to reason about.
    - Split off the hook-specific logic, but preserve
      the general traversal logic.
    - Remove duplication of `Metadata.build_hash_from`.
    - Only call `Metadata.build_hash_from` if needed. If
      we are dealing with an :example hook there is no need.
    myronmarston committed Jul 4, 2016
  8. @myronmarston

    Merge pull request #2285 from eugeneius/suite_hook_docs_fix

    Fix documentation of restriction on suite hooks
    myronmarston committed on GitHub Jul 6, 2016
  9. @eugeneius
Commits on Jul 6, 2016
  1. @myronmarston
  2. @myronmarston

    Merge pull request #2280 from eugeneius/fix_adding_hooks_to_existing_…

    …groups
    
    Fix adding config hooks to existing example groups
    myronmarston committed on GitHub Jul 6, 2016
Commits on Jul 5, 2016
  1. @eugeneius

    Only apply modules to highest level matching group

    For the behaviour when apploying helper modules to existing example
    groups to be fully consistent with the behaviour for new groups, we
    shouldn't apply the module if any of the example group's parent groups
    already have the module applied.
    
    Also refactor how we add hooks to existing groups to use the same code.
    eugeneius committed Jul 5, 2016
Commits on Jul 4, 2016
  1. @eugeneius

    Fix adding config hooks to existing example groups

    When an example group is created, the existing config hooks are added to
    it if their metadata filters match and none of the new example group's
    parent groups already have the hook added.
    
    The current implementation adds new config hooks to all existing example
    groups, which means they can be run multiple times if several nested
    example groups all match their metadata filters, which doesn't happen if
    the config hook is defined first.
    
    To get the same behaviour regardless of the order in which hooks and
    groups are defined, we can walk the inheritence heirarchy starting from
    the top level example groups, and only add the new hook to the first
    matching group on each branch.
    eugeneius committed Jul 4, 2016
  2. @JonRowe

    Merge pull request #2279 from rspec/fix_build

    Limit JSON version on lower rubies
    JonRowe committed on GitHub Jul 4, 2016
  3. @JonRowe
Commits on Jul 1, 2016
  1. @samphippen

    Bump version to 3.6.0.pre

    samphippen committed Jul 1, 2016