From 16bb232c8f0d001694909d9fba010f6f57ff905c Mon Sep 17 00:00:00 2001 From: Marc-Andre Lafortune Date: Thu, 4 Jun 2020 13:31:14 -0400 Subject: [PATCH] Avoid be_truthy / be_falsey --- features/clear_examples.feature | 4 +- .../configuration/custom_settings.feature | 20 +++---- .../example_groups/shared_examples.feature | 4 +- features/hooks/around_hooks.feature | 2 +- lib/rspec/core/world.rb | 1 + spec/rspec/core/configuration_options_spec.rb | 20 +++---- spec/rspec/core/configuration_spec.rb | 26 ++++---- spec/rspec/core/example_group_spec.rb | 40 ++++++------- spec/rspec/core/example_spec.rb | 8 +-- spec/rspec/core/filter_manager_spec.rb | 16 ++--- spec/rspec/core/metadata_filter_spec.rb | 60 +++++++++---------- spec/rspec/core/option_parser_spec.rb | 4 +- spec/rspec/core/pending_example_spec.rb | 2 +- spec/rspec/core/rake_task_spec.rb | 2 +- spec/rspec/core/shared_context_spec.rb | 8 +-- spec/rspec/core_spec.rb | 4 +- 16 files changed, 111 insertions(+), 110 deletions(-) diff --git a/features/clear_examples.feature b/features/clear_examples.feature index b2e7a517bd..ad6495c758 100644 --- a/features/clear_examples.feature +++ b/features/clear_examples.feature @@ -34,7 +34,7 @@ Feature: Running specs multiple times with different runner options in the same RSpec.describe "truth" do describe true do it "is truthy" do - expect(true).to be_truthy + expect(true).to be(true) end it "is not falsy" do @@ -48,7 +48,7 @@ Feature: Running specs multiple times with different runner options in the same end it "is truthy" do - expect(false).not_to be_truthy + expect(false).not_to be(true) end end end diff --git a/features/configuration/custom_settings.feature b/features/configuration/custom_settings.feature index 6540da698f..bb72d9ec4c 100644 --- a/features/configuration/custom_settings.feature +++ b/features/configuration/custom_settings.feature @@ -15,17 +15,17 @@ Feature: custom settings end it "acts false by default" do - expect(RSpec.configuration.custom_setting).to be_falsey + expect(RSpec.configuration.custom_setting).to be(false) end it "is exposed as a predicate" do - expect(RSpec.configuration.custom_setting?).to be_falsey + expect(RSpec.configuration.custom_setting?).to be(false) end it "can be overridden" do RSpec.configuration.custom_setting = true - expect(RSpec.configuration.custom_setting).to be_truthy - expect(RSpec.configuration.custom_setting?).to be_truthy + expect(RSpec.configuration.custom_setting).to be(true) + expect(RSpec.configuration.custom_setting?).to be(true) end end """ @@ -41,17 +41,17 @@ Feature: custom settings RSpec.describe "custom setting" do it "is true by default" do - expect(RSpec.configuration.custom_setting).to be_truthy + expect(RSpec.configuration.custom_setting).to be(true) end it "is exposed as a predicate" do - expect(RSpec.configuration.custom_setting?).to be_truthy + expect(RSpec.configuration.custom_setting?).to be(true) end it "can be overridden" do RSpec.configuration.custom_setting = false - expect(RSpec.configuration.custom_setting).to be_falsey - expect(RSpec.configuration.custom_setting?).to be_falsey + expect(RSpec.configuration.custom_setting).to be(false) + expect(RSpec.configuration.custom_setting?).to be(false) end end """ @@ -71,11 +71,11 @@ Feature: custom settings RSpec.describe "custom setting" do it "returns the value set in the last cofigure block to get eval'd" do - expect(RSpec.configuration.custom_setting).to be_truthy + expect(RSpec.configuration.custom_setting).to be(true) end it "is exposed as a predicate" do - expect(RSpec.configuration.custom_setting?).to be_truthy + expect(RSpec.configuration.custom_setting?).to be(true) end end """ diff --git a/features/example_groups/shared_examples.feature b/features/example_groups/shared_examples.feature index a431afb560..c63ce45a79 100644 --- a/features/example_groups/shared_examples.feature +++ b/features/example_groups/shared_examples.feature @@ -106,13 +106,13 @@ Feature: shared examples describe "#include?" do context "with an item that is in the collection" do it "returns true" do - expect(collection.include?(7)).to be_truthy + expect(collection.include?(7)).to be(true) end end context "with an item that is not in the collection" do it "returns false" do - expect(collection.include?(9)).to be_falsey + expect(collection.include?(9)).to be(false) end end end diff --git a/features/hooks/around_hooks.feature b/features/hooks/around_hooks.feature index 748210c938..8e01cc336c 100644 --- a/features/hooks/around_hooks.feature +++ b/features/hooks/around_hooks.feature @@ -219,7 +219,7 @@ Feature: `around` hooks end it "runs the example in the correct context" do - expect(included_in_configure_block).to be_truthy + expect(included_in_configure_block).to be(true) end end """ diff --git a/lib/rspec/core/world.rb b/lib/rspec/core/world.rb index d766424f00..12909cab01 100644 --- a/lib/rspec/core/world.rb +++ b/lib/rspec/core/world.rb @@ -17,6 +17,7 @@ class World attr_accessor :non_example_failure def initialize(configuration=RSpec.configuration) + @wants_to_quit = false @configuration = configuration configuration.world = self @example_groups = [] diff --git a/spec/rspec/core/configuration_options_spec.rb b/spec/rspec/core/configuration_options_spec.rb index 368e6399da..ab7ee587d2 100644 --- a/spec/rspec/core/configuration_options_spec.rb +++ b/spec/rspec/core/configuration_options_spec.rb @@ -296,16 +296,16 @@ end describe "--fail-fast" do - it "defaults to false" do - expect(parse_options[:fail_fast]).to be_falsey + it "defaults to nil" do + expect(parse_options[:fail_fast]).to be(nil) end - it "sets fail_fast on config" do - expect(parse_options("--fail-fast")[:fail_fast]).to be_truthy + it "sets fail_fast to 1 on config" do + expect(parse_options("--fail-fast")[:fail_fast]).to be(1) end - it "sets fail_fast on config" do - expect(parse_options("--no-fail-fast")[:fail_fast]).to be_falsey + it "sets fail_fast to false on config" do + expect(parse_options("--no-fail-fast")[:fail_fast]).to be(false) end end @@ -322,12 +322,12 @@ end describe "--dry-run" do - it "defaults to false" do - expect(parse_options[:dry_run]).to be_falsey + it "defaults to nil" do + expect(parse_options[:dry_run]).to be(nil) end it "sets dry_run on config" do - expect(parse_options("--dry-run")[:dry_run]).to be_truthy + expect(parse_options("--dry-run")[:dry_run]).to be(true) end end @@ -464,7 +464,7 @@ def expect_parsing_to_fail_mentioning_source(source, options=[]) expect(options[:requires]).to eq(["some_file"]) expect(options[:full_description]).to eq([/foo\ bar/]) - expect(options[:drb]).to be_truthy + expect(options[:drb]).to be(true) expect(options[:formatters]).to eq([['global']]) end end diff --git a/spec/rspec/core/configuration_spec.rb b/spec/rspec/core/configuration_spec.rb index 74ef6bbcdf..a79a7d0720 100644 --- a/spec/rspec/core/configuration_spec.rb +++ b/spec/rspec/core/configuration_spec.rb @@ -293,7 +293,7 @@ def mod.configuration; @config ||= Struct.new(:custom_setting).new; end mod_config.custom_setting = true end - expect(mod.configuration.custom_setting).to be_truthy + expect(mod.configuration.custom_setting).to be(true) end it "raises if framework module doesn't support configuration" do @@ -1301,13 +1301,13 @@ def metadata_hash(*args) describe "#run_all_when_everything_filtered?" do - it "defaults to false" do - expect(config.run_all_when_everything_filtered?).to be_falsey + it "defaults to nil" do + expect(config.run_all_when_everything_filtered?).to be(false) end it "can be queried with question method" do config.run_all_when_everything_filtered = true - expect(config.run_all_when_everything_filtered?).to be_truthy + expect(config.run_all_when_everything_filtered?).to be(true) end end @@ -1779,14 +1779,14 @@ def metadata_hash(*args) config_2 = Configuration.new config_1.full_backtrace = true - expect(config_2.full_backtrace?).to be_falsey + expect(config_2.full_backtrace?).to be(false) end end describe "#backtrace_exclusion_patterns=" do it "actually receives the new filter values" do config.backtrace_exclusion_patterns = [/.*/] - expect(config.backtrace_formatter.exclude? "this").to be_truthy + expect(config.backtrace_formatter.exclude? "this").to be(true) end end @@ -1805,7 +1805,7 @@ def metadata_hash(*args) describe "#backtrace_exclusion_patterns" do it "can be appended to" do config.backtrace_exclusion_patterns << /.*/ - expect(config.backtrace_formatter.exclude? "this").to be_truthy + expect(config.backtrace_formatter.exclude? "this").to be(true) end end @@ -2213,7 +2213,7 @@ def exclude?(line) end it "adds a predicate" do - expect(config.custom_option?).to be_falsey + expect(config.custom_option?).to be(false) end it "can be overridden" do @@ -2232,7 +2232,7 @@ def exclude?(line) end it "returns true for the predicate" do - expect(config.custom_option?).to be_truthy + expect(config.custom_option?).to be(true) end it "can be overridden with a truthy value" do @@ -2269,7 +2269,7 @@ def exclude?(line) it "delegates the predicate to the other option" do config.custom_option = true - expect(config.another_custom_option?).to be_truthy + expect(config.another_custom_option?).to be(true) end end end @@ -2526,11 +2526,11 @@ def example_numbered(num) it "forces 'false' value" do config.add_setting :custom_option config.custom_option = true - expect(config.custom_option?).to be_truthy + expect(config.custom_option?).to be(true) config.force :custom_option => false - expect(config.custom_option?).to be_falsey + expect(config.custom_option?).to be(false) config.custom_option = true - expect(config.custom_option?).to be_falsey + expect(config.custom_option?).to be(false) end end diff --git a/spec/rspec/core/example_group_spec.rb b/spec/rspec/core/example_group_spec.rb index 0b82292e17..0cba8ed37c 100644 --- a/spec/rspec/core/example_group_spec.rb +++ b/spec/rspec/core/example_group_spec.rb @@ -180,7 +180,7 @@ def metadata_hash(*args) it 'does not have problems with example groups named "Core"', :unless => RUBY_VERSION == '1.9.2' do RSpec.describe("Core") - expect(defined?(::RSpec::ExampleGroups::Core)).to be_truthy + expect(defined?(::RSpec::ExampleGroups::Core)).to eq('constant') # The original bug was triggered when a group was defined AFTER one named `Core`, # due to it not using the fully qualified `::RSpec::Core::ExampleGroup` constant. @@ -190,7 +190,7 @@ def metadata_hash(*args) it 'does not have problems with example groups named "RSpec"', :unless => RUBY_VERSION == '1.9.2' do RSpec.describe("RSpec") - expect(defined?(::RSpec::ExampleGroups::RSpec)).to be_truthy + expect(defined?(::RSpec::ExampleGroups::RSpec)).to eq('constant') # The original bug was triggered when a group was defined AFTER one named `RSpec`, # due to it not using the fully qualified `::RSpec::Core::ExampleGroup` constant. @@ -535,7 +535,7 @@ def ascending_numbers end end - expect(group.run).to be_truthy + expect(group.run).to be(true) end end @@ -551,7 +551,7 @@ def ascending_numbers end end - expect(group.run).to be_truthy + expect(group.run).to be(true) end end end @@ -566,7 +566,7 @@ def ascending_numbers end end - expect(group.run).to be_truthy, "expected examples in group to pass" + expect(group.run).to be(true), "expected examples in group to pass" end context "when a class is passed" do @@ -662,7 +662,7 @@ def define_and_run_group(define_outer_example = false) let(:focused_example) { RSpec.describe.send example_alias, "a focused example" } it 'defines an example that can be filtered with :focus => true' do - expect(focused_example.metadata[:focus]).to be_truthy + expect(focused_example.metadata[:focus]).to be(true) end end end @@ -778,7 +778,7 @@ def define_and_run_group(define_outer_example = false) group.example("example") {} group.run - expect(RSpec.world.wants_to_quit).to be_falsey + expect(RSpec.world.wants_to_quit).to be(false) end it "runs the before eachs in order" do @@ -941,7 +941,7 @@ def define_and_run_group(define_outer_example = false) group = RSpec.describe group.before(:all) { raise "error in before all" } example = group.example("equality") { expect(1).to eq(2) } - expect(group.run).to be_falsey + expect(group.run).to be(false) expect(example.metadata).not_to be_nil expect(example.execution_result.exception).not_to be_nil @@ -1291,7 +1291,7 @@ def extract_execution_results(group) example('ex 2') { expect(1).to eq(1) } end allow(group).to receive(:filtered_examples) { group.examples } - expect(group.run(reporter)).to be_truthy + expect(group.run(reporter)).to be(true) end it "returns false if any of the examples fail" do @@ -1300,7 +1300,7 @@ def extract_execution_results(group) example('ex 2') { expect(1).to eq(2) } end allow(group).to receive(:filtered_examples) { group.examples } - expect(group.run(reporter)).to be_falsey + expect(group.run(reporter)).to be(false) end it "runs all examples, regardless of any of them failing" do @@ -1312,7 +1312,7 @@ def extract_execution_results(group) group.filtered_examples.each do |example| expect(example).to receive(:run) end - expect(group.run(reporter)).to be_falsey + expect(group.run(reporter)).to be(false) end end @@ -1366,12 +1366,12 @@ def extract_execution_results(group) describe "ivars are not shared across examples" do it "(first example)" do @a = 1 - expect(defined?(@b)).to be_falsey + expect(defined?(@b)).to be(nil) end it "(second example)" do @b = 2 - expect(defined?(@a)).to be_falsey + expect(defined?(@a)).to be(nil) end end @@ -1427,8 +1427,8 @@ def extract_execution_results(group) it "sets RSpec.world.wants_to_quit flag if encountering an exception in before(:all)" do group().before(:all) { raise "error in before all" } group().example("equality") { expect(1).to eq(2) } - expect(group().run(reporter)).to be_falsey - expect(RSpec.world.wants_to_quit).to be_truthy + expect(group().run(reporter)).to be(false) + expect(RSpec.world.wants_to_quit).to be(true) end end @@ -1457,7 +1457,7 @@ def extract_execution_results(group) expect(group().run(reporter)).to be false - expect(RSpec.world.wants_to_quit).to be_falsey + expect(RSpec.world.wants_to_quit).to be(false) end it "sets RSpec.world.wants_to_quit flag if encountering an exception in before(:all) causing at least 3 failures" do @@ -1500,7 +1500,7 @@ def extract_execution_results(group) end end - expect(group.run(reporter)).to be_truthy + expect(group.run(reporter)).to be(true) end end @@ -1517,7 +1517,7 @@ def extract_execution_results(group) end end - expect(group.run(reporter)).to be_falsey + expect(group.run(reporter)).to be(false) end end @@ -1534,7 +1534,7 @@ def extract_execution_results(group) end end - expect(group.run(reporter)).to be_falsey + expect(group.run(reporter)).to be(false) end end end @@ -1751,7 +1751,7 @@ def foo; end def foo; "bar"; end end end - expect(group.run).to be_truthy + expect(group.run).to be(true) end end end diff --git a/spec/rspec/core/example_spec.rb b/spec/rspec/core/example_spec.rb index 325efe91fc..4e7dee424a 100644 --- a/spec/rspec/core/example_spec.rb +++ b/spec/rspec/core/example_spec.rb @@ -371,7 +371,7 @@ def assert(val) example('example') { expect(1).to eq(1) } end group.run - expect(after_run).to be_truthy, "expected after(:each) to be run" + expect(after_run).to be(true), "expected after(:each) to be run" end it "runs after(:each) when the example fails" do @@ -381,7 +381,7 @@ def assert(val) example('example') { expect(1).to eq(2) } end group.run - expect(after_run).to be_truthy, "expected after(:each) to be run" + expect(after_run).to be(true), "expected after(:each) to be run" end it "runs after(:each) when the example raises an Exception" do @@ -391,7 +391,7 @@ def assert(val) example('example') { raise "this error" } end group.run - expect(after_run).to be_truthy, "expected after(:each) to be run" + expect(after_run).to be(true), "expected after(:each) to be run" end context "with an after(:each) that raises" do @@ -403,7 +403,7 @@ def assert(val) example('example') { expect(1).to eq(1) } end group.run - expect(after_run).to be_truthy, "expected after(:each) to be run" + expect(after_run).to be(true), "expected after(:each) to be run" end it "stores the exception" do diff --git a/spec/rspec/core/filter_manager_spec.rb b/spec/rspec/core/filter_manager_spec.rb index 63173cbb42..c4e48cd68e 100644 --- a/spec/rspec/core/filter_manager_spec.rb +++ b/spec/rspec/core/filter_manager_spec.rb @@ -443,46 +443,46 @@ def exclude?(example) describe "the default :if filter" do it "does not exclude a spec with { :if => true } metadata" do example = example_with_metadata(:if => true) - expect(exclude?(example)).to be_falsey + expect(exclude?(example)).to be(false) end it "excludes a spec with { :if => false } metadata" do example = example_with_metadata(:if => false) - expect(exclude?(example)).to be_truthy + expect(exclude?(example)).to be(true) end it "excludes a spec with { :if => nil } metadata" do example = example_with_metadata(:if => nil) - expect(exclude?(example)).to be_truthy + expect(exclude?(example)).to be(true) end it "continues to be an exclusion even if exclusions are cleared" do example = example_with_metadata(:if => false) filter_manager.exclusions.clear - expect(exclude?(example)).to be_truthy + expect(exclude?(example)).to be(true) end end describe "the default :unless filter" do it "excludes a spec with { :unless => true } metadata" do example = example_with_metadata(:unless => true) - expect(exclude?(example)).to be_truthy + expect(exclude?(example)).to be(true) end it "does not exclude a spec with { :unless => false } metadata" do example = example_with_metadata(:unless => false) - expect(exclude?(example)).to be_falsey + expect(exclude?(example)).to be(false) end it "does not exclude a spec with { :unless => nil } metadata" do example = example_with_metadata(:unless => nil) - expect(exclude?(example)).to be_falsey + expect(exclude?(example)).to be(false) end it "continues to be an exclusion even if exclusions are cleared" do example = example_with_metadata(:unless => true) filter_manager.exclusions.clear - expect(exclude?(example)).to be_truthy + expect(exclude?(example)).to be(true) end end end diff --git a/spec/rspec/core/metadata_filter_spec.rb b/spec/rspec/core/metadata_filter_spec.rb index 4a5857a8c6..9f8ffefaa7 100644 --- a/spec/rspec/core/metadata_filter_spec.rb +++ b/spec/rspec/core/metadata_filter_spec.rb @@ -60,45 +60,45 @@ def filter_applies?(key, value, metadata) it "matches the group when the line_number is the example group line number" do # this call doesn't really make sense since filter_applies? is only called # for example metadata not group metadata - expect(filter_applies?(condition_key, group_condition, group_metadata)).to be_truthy + expect(filter_applies?(condition_key, group_condition, group_metadata)).to be(true) end it "matches the example when the line_number is the grandparent example group line number" do - expect(filter_applies?(condition_key, parent_group_condition, example_metadata)).to be_truthy + expect(filter_applies?(condition_key, parent_group_condition, example_metadata)).to be(true) end it "matches the example when the line_number is the parent example group line number" do - expect(filter_applies?(condition_key, group_condition, example_metadata)).to be_truthy + expect(filter_applies?(condition_key, group_condition, example_metadata)).to be(true) end it "matches the example when the line_number is the example line number" do - expect(filter_applies?(condition_key, example_condition, example_metadata)).to be_truthy + expect(filter_applies?(condition_key, example_condition, example_metadata)).to be(true) end it "matches when the line number is between this example and the next" do - expect(filter_applies?(condition_key, between_examples_condition, example_metadata)).to be_truthy + expect(filter_applies?(condition_key, between_examples_condition, example_metadata)).to be(true) end it "does not match when the line number matches the next example" do - expect(filter_applies?(condition_key, next_example_condition, example_metadata)).to be_falsey + expect(filter_applies?(condition_key, next_example_condition, example_metadata)).to be(false) end end it "matches a proc with no arguments that evaluates to true" do - expect(filter_applies?(:if, lambda { true }, example_metadata)).to be_truthy + expect(filter_applies?(:if, lambda { true }, example_metadata)).to be(true) end it "matches a proc that evaluates to true" do - expect(filter_applies?(:if, lambda { |v| v }, example_metadata)).to be_truthy + expect(filter_applies?(:if, lambda { |v| v }, example_metadata)).to be(true) end it "does not match a proc that evaluates to false" do - expect(filter_applies?(:if, lambda { |v| !v }, example_metadata)).to be_falsey + expect(filter_applies?(:if, lambda { |v| !v }, example_metadata)).to be(false) end it "matches a proc with an arity of 2" do example_metadata[:foo] = nil - expect(filter_applies?(:foo, lambda { |v, m| m == example_metadata }, example_metadata)).to be_truthy + expect(filter_applies?(:foo, lambda { |v, m| m == example_metadata }, example_metadata)).to be(true) end it "raises an error when the proc has an incorrect arity" do @@ -151,26 +151,26 @@ def matcher.===(str) context "with a nested hash" do it 'matches when the nested entry matches' do metadata = { :foo => { :bar => "words" } } - expect(filter_applies?(:foo, { :bar => /wor/ }, metadata)).to be_truthy + expect(filter_applies?(:foo, { :bar => /wor/ }, metadata)).to be(true) end it 'does not match when the nested entry does not match' do metadata = { :foo => { :bar => "words" } } - expect(filter_applies?(:foo, { :bar => /sword/ }, metadata)).to be_falsey + expect(filter_applies?(:foo, { :bar => /sword/ }, metadata)).to be(false) end it 'does not match when the metadata lacks the key' do - expect(filter_applies?(:foo, { :bar => /sword/ }, {})).to be_falsey + expect(filter_applies?(:foo, { :bar => /sword/ }, {})).to be(false) end it 'does not match when the metadata does not have a hash entry for the key' do metadata = { :foo => "words" } - expect(filter_applies?(:foo, { :bar => /word/ }, metadata)).to be_falsey + expect(filter_applies?(:foo, { :bar => /word/ }, metadata)).to be(false) end it 'matches when a metadata key is specified without a value and exists in the metadata hash' do metadata = { :foo => "words" } - expect(filter_applies?(:foo, true, metadata)).to be_truthy + expect(filter_applies?(:foo, true, metadata)).to be(true) end end @@ -184,39 +184,39 @@ def matcher.===(str) end it "matches a symbol" do - expect(filter_applies?(:tag, 'one', metadata_with_array)).to be_truthy - expect(filter_applies?(:tag, :one, metadata_with_array)).to be_truthy - expect(filter_applies?(:tag, 'two', metadata_with_array)).to be_falsey + expect(filter_applies?(:tag, 'one', metadata_with_array)).to be(true) + expect(filter_applies?(:tag, :one, metadata_with_array)).to be(true) + expect(filter_applies?(:tag, 'two', metadata_with_array)).to be(false) end it "matches a string" do - expect(filter_applies?(:tag, 'three', metadata_with_array)).to be_truthy - expect(filter_applies?(:tag, :three, metadata_with_array)).to be_truthy - expect(filter_applies?(:tag, 'tree', metadata_with_array)).to be_falsey + expect(filter_applies?(:tag, 'three', metadata_with_array)).to be(true) + expect(filter_applies?(:tag, :three, metadata_with_array)).to be(true) + expect(filter_applies?(:tag, 'tree', metadata_with_array)).to be(false) end it "matches an integer" do - expect(filter_applies?(:tag, '2', metadata_with_array)).to be_truthy - expect(filter_applies?(:tag, 2, metadata_with_array)).to be_truthy - expect(filter_applies?(:tag, 3, metadata_with_array)).to be_falsey + expect(filter_applies?(:tag, '2', metadata_with_array)).to be(true) + expect(filter_applies?(:tag, 2, metadata_with_array)).to be(true) + expect(filter_applies?(:tag, 3, metadata_with_array)).to be(false) end it "matches a regexp" do - expect(filter_applies?(:tag, 'four', metadata_with_array)).to be_truthy - expect(filter_applies?(:tag, 'fourtune', metadata_with_array)).to be_truthy - expect(filter_applies?(:tag, 'fortune', metadata_with_array)).to be_falsey + expect(filter_applies?(:tag, 'four', metadata_with_array)).to be(true) + expect(filter_applies?(:tag, 'fourtune', metadata_with_array)).to be(true) + expect(filter_applies?(:tag, 'fortune', metadata_with_array)).to be(false) end it "matches a proc that evaluates to true" do - expect(filter_applies?(:tag, lambda { |values| values.include? 'three' }, metadata_with_array)).to be_truthy + expect(filter_applies?(:tag, lambda { |values| values.include? 'three' }, metadata_with_array)).to be(true) end it "does not match a proc that evaluates to false" do - expect(filter_applies?(:tag, lambda { |values| values.include? 'nothing' }, metadata_with_array)).to be_falsey + expect(filter_applies?(:tag, lambda { |values| values.include? 'nothing' }, metadata_with_array)).to be(false) end it 'matches when a metadata key is specified without a value and exists in the metadata hash' do - expect(filter_applies?(:tag, true, metadata_with_array)).to be_truthy + expect(filter_applies?(:tag, true, metadata_with_array)).to be(true) end end end diff --git a/spec/rspec/core/option_parser_spec.rb b/spec/rspec/core/option_parser_spec.rb index 73084ec9cf..af3edf4ec6 100644 --- a/spec/rspec/core/option_parser_spec.rb +++ b/spec/rspec/core/option_parser_spec.rb @@ -89,7 +89,7 @@ module RSpec::Core it 'sets the `:drb` option to true' do options = parser.parse - expect(options[:drb]).to be_truthy + expect(options[:drb]).to be(true) end it 'sets the `:runner` option with the `DrbWithFallback` invocation' do @@ -339,7 +339,7 @@ module RSpec::Core it "sets the `:bisect` option" do options = Parser.parse(%w[ --bisect ]) - expect(options[:bisect]).to be_truthy + expect(options[:bisect]).to be(true) end it "sets the `:runner` option with the `Bisect` invocation" do diff --git a/spec/rspec/core/pending_example_spec.rb b/spec/rspec/core/pending_example_spec.rb index 06cbaf52c9..fe9fe4b83b 100644 --- a/spec/rspec/core/pending_example_spec.rb +++ b/spec/rspec/core/pending_example_spec.rb @@ -44,7 +44,7 @@ group.run example = group.examples.first - expect(example.metadata[:pending]).to be_truthy + expect(example.metadata[:pending]).to be(true) end end diff --git a/spec/rspec/core/rake_task_spec.rb b/spec/rspec/core/rake_task_spec.rb index a1168b6de7..ae2c9e636f 100644 --- a/spec/rspec/core/rake_task_spec.rb +++ b/spec/rspec/core/rake_task_spec.rb @@ -28,7 +28,7 @@ def spec_command end expect(the_task).to receive(:run_task) { true } - expect(Rake.application.invoke_task("rake_task_args[first_spec.rb]")).to be_truthy + Rake.application.invoke_task("rake_task_args[first_spec.rb]") end end diff --git a/spec/rspec/core/shared_context_spec.rb b/spec/rspec/core/shared_context_spec.rb index 67218f2418..133fce977c 100644 --- a/spec/rspec/core/shared_context_spec.rb +++ b/spec/rspec/core/shared_context_spec.rb @@ -26,10 +26,10 @@ group.run - expect(before_all_hook).to be_truthy - expect(before_each_hook).to be_truthy - expect(after_each_hook).to be_truthy - expect(after_all_hook).to be_truthy + expect(before_all_hook).to be(true) + expect(before_each_hook).to be(true) + expect(after_each_hook).to be(true) + expect(after_all_hook).to be(true) end include RSpec::Core::SharedExampleGroup::TopLevelDSL diff --git a/spec/rspec/core_spec.rb b/spec/rspec/core_spec.rb index 42bb3e844d..085acbbbab 100644 --- a/spec/rspec/core_spec.rb +++ b/spec/rspec/core_spec.rb @@ -289,9 +289,9 @@ def reporter describe "::Core.path_to_executable" do it 'returns the absolute location of the exe/rspec file' do - expect(File.exist? RSpec::Core.path_to_executable).to be_truthy + expect(File.exist? RSpec::Core.path_to_executable).to be(true) expect(File.read(RSpec::Core.path_to_executable)).to include("RSpec::Core::Runner.invoke") - expect(File.executable? RSpec::Core.path_to_executable).to be_truthy unless RSpec::Support::OS.windows? + expect(File.executable? RSpec::Core.path_to_executable).to be(true) unless RSpec::Support::OS.windows? end end