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

Don't reset before_context_ivars in reset_memoized #2102

Merged
merged 2 commits into from
Oct 27, 2015
Merged

Don't reset before_context_ivars in reset_memoized #2102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bea9137
Don't reset before_context_ivars in reset_memoized
bootstraponline Oct 27, 2015
7d8eae8
Fix rake_task.rb coverage
bootstraponline Oct 27, 2015
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
1 change: 0 additions & 1 deletion lib/rspec/core/example_group.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,6 @@ def self.reset_memoized
@_descendants = nil
@parent_groups = nil
@declaration_line_numbers = nil
@before_context_ivars = nil
end

# Adds an example to the example group
Expand Down
2 changes: 2 additions & 0 deletions lib/rspec/core/rake_task.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@

RSpec::Support.require_rspec_support "ruby_features"

# :nocov:
unless RSpec::Support.respond_to?(:require_rspec_core)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When I run locally on Ruby 2.2.3:

./script/rspec_with_simplecov spec --backtrace --format progress --profile --format progress

require_rspec_core is already defined so the unless block never executes (and counts against coverage).

RSpec::Support.define_optimized_require_for_rspec(:core) { |f| require_relative "../#{f}" }
end
# :nocov:

RSpec::Support.require_rspec_core "shell_escape"

Expand Down
8 changes: 2 additions & 6 deletions spec/rspec/core/example_group_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1796,9 +1796,7 @@ def group_ids group

group.add_example group.examples.first
expect(group.examples.length).to eq(2)

new_ids = group_ids group
new_ids.each_with_index { |id, idx| expect(id).to_not eq(original_ids[idx]) }
expect(original_ids).to_not eq(group_ids(group))
end

it 'allows removing examples' do
Expand All @@ -1813,9 +1811,7 @@ def group_ids group

group.remove_example group.examples.first
expect(group.examples.length).to eq(0)

new_ids = group_ids group
new_ids.each_with_index { |id, idx| expect(id).to_not eq(original_ids[idx]) }
expect(original_ids).to_not eq(group_ids(group))
end
end
end