Skip to content

Commit 6a380c3

Browse files
committed
revert RSpec/BeEq changes and disable
1 parent fc5e1eb commit 6a380c3

11 files changed

+34
-31
lines changed

Diff for: .rubocop.yml

+3
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,9 @@ Rails/RakeEnvironment:
131131
Rails/SkipsModelValidations:
132132
Enabled: false
133133

134+
RSpec/BeEq:
135+
Enabled: false
136+
134137
# This cop does not seem to work in rubocop-rspec 1.28.0
135138
RSpec/DescribeClass:
136139
Enabled: false

Diff for: spec/controllers/articles_controller_spec.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@
1010
after { PaperTrail.enabled = false }
1111

1212
it "returns true" do
13-
expect(PaperTrail.enabled?).to be(true)
13+
expect(PaperTrail.enabled?).to eq(true)
1414
post :create, params: { article: { title: "Doh", content: FFaker::Lorem.sentence } }
1515
expect(assigns(:article)).not_to be_nil
16-
expect(PaperTrail.request.enabled?).to be(true)
16+
expect(PaperTrail.request.enabled?).to eq(true)
1717
expect(assigns(:article).versions.length).to eq(1)
1818
end
1919
end
2020

2121
context "when PaperTrail.enabled? == false" do
2222
it "returns false" do
23-
expect(PaperTrail.enabled?).to be(false)
23+
expect(PaperTrail.enabled?).to eq(false)
2424
post :create, params: { article: { title: "Doh", content: FFaker::Lorem.sentence } }
25-
expect(PaperTrail.request.enabled?).to be(false)
25+
expect(PaperTrail.request.enabled?).to eq(false)
2626
expect(assigns(:article).versions.length).to eq(0)
2727
end
2828
end

Diff for: spec/controllers/widgets_controller_spec.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
it "controller metadata methods should get evaluated" do
2222
request.env["HTTP_USER_AGENT"] = "User-Agent"
2323
post :create, params: { widget: { name: "Flugel" } }
24-
expect(PaperTrail.request.enabled?).to be(true)
24+
expect(PaperTrail.request.enabled?).to eq(true)
2525
expect(PaperTrail.request.whodunnit).to(eq(153))
2626
expect(PaperTrail.request.controller_info.present?).to(be(true))
2727
expect(PaperTrail.request.controller_info.key?(:ip)).to(be(true))
@@ -34,7 +34,7 @@
3434
request.env["HTTP_USER_AGENT"] = "Disable User-Agent"
3535
post :create, params: { widget: { name: "Flugel" } }
3636
expect(assigns(:widget).versions.length).to(eq(0))
37-
expect(PaperTrail.request.enabled?).to be(false)
37+
expect(PaperTrail.request.enabled?).to eq(false)
3838
expect(PaperTrail.request.whodunnit).to be_nil
3939
expect(PaperTrail.request.controller_info).to eq({})
4040
end

Diff for: spec/models/animal_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
describe "#descends_from_active_record?" do
1212
it "returns true, meaning that Animal is not an STI subclass" do
13-
expect(described_class.descends_from_active_record?).to be(true)
13+
expect(described_class.descends_from_active_record?).to eq(true)
1414
end
1515
end
1616

Diff for: spec/models/cat_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
RSpec.describe Cat, versioning: true do
66
describe "#descends_from_active_record?" do
77
it "returns false, meaning that Cat is an STI subclass" do
8-
expect(described_class.descends_from_active_record?).to be(false)
8+
expect(described_class.descends_from_active_record?).to eq(false)
99
end
1010
end
1111
end

Diff for: spec/models/person_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
person.assign_attributes(time_zone: "Pacific Time (US & Canada)")
7676
person.save!
7777
len = person.versions.last.object_changes.length
78-
expect(len < 118).to be(true)
78+
expect(len < 118).to eq(true)
7979
end
8080

8181
it "version.object attribute should have stored value from serializer" do

Diff for: spec/models/plant_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
describe "#descends_from_active_record?" do
1212
it "returns true, meaning that Animal is not an STI subclass" do
13-
expect(described_class.descends_from_active_record?).to be(true)
13+
expect(described_class.descends_from_active_record?).to eq(true)
1414
end
1515
end
1616

Diff for: spec/paper_trail/cleaner_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ module PaperTrail
6262
expect(animal.versions.first.created_at.to_date).to(eq(date))
6363
# Why use `equal?` here instead of something less strict?
6464
# Doesn't `to_date` always produce a new date object?
65-
expect(date.equal?(animal.versions.last.created_at.to_date)).to be(false)
65+
expect(date.equal?(animal.versions.last.created_at.to_date)).to eq(false)
6666
end
6767
end
6868

Diff for: spec/paper_trail/events/base_spec.rb

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module Events
1010
it "returns true" do
1111
g = Gadget.new(created_at: Time.current)
1212
event = described_class.new(g, false)
13-
expect(event.changed_notably?).to be(true)
13+
expect(event.changed_notably?).to eq(true)
1414
end
1515
end
1616

@@ -19,14 +19,14 @@ module Events
1919
gadget = Gadget.create!(created_at: Time.current)
2020
gadget.name = "Wrench"
2121
event = described_class.new(gadget, false)
22-
expect(event.changed_notably?).to be(true)
22+
expect(event.changed_notably?).to eq(true)
2323
end
2424

2525
it "does not acknowledge ignored attr (brand)" do
2626
gadget = Gadget.create!(created_at: Time.current)
2727
gadget.brand = "Acme"
2828
event = described_class.new(gadget, false)
29-
expect(event.changed_notably?).to be(false)
29+
expect(event.changed_notably?).to eq(false)
3030
end
3131
end
3232

@@ -36,15 +36,15 @@ module Events
3636
gadget.name = "Wrench"
3737
gadget.updated_at = Time.current
3838
event = described_class.new(gadget, false)
39-
expect(event.changed_notably?).to be(true)
39+
expect(event.changed_notably?).to eq(true)
4040
end
4141

4242
it "does not acknowledge ignored attrs and timestamps only" do
4343
gadget = Gadget.create!(created_at: Time.current)
4444
gadget.brand = "Acme"
4545
gadget.updated_at = Time.current
4646
event = described_class.new(gadget, false)
47-
expect(event.changed_notably?).to be(false)
47+
expect(event.changed_notably?).to eq(false)
4848
end
4949
end
5050
end

Diff for: spec/paper_trail/request_spec.rb

+10-10
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module PaperTrail
66
::RSpec.describe(Request, versioning: true) do
77
describe ".enabled_for_model?" do
88
it "returns true" do
9-
expect(PaperTrail.request.enabled_for_model?(Widget)).to be(true)
9+
expect(PaperTrail.request.enabled_for_model?(Widget)).to eq(true)
1010
end
1111
end
1212

@@ -16,9 +16,9 @@ module PaperTrail
1616
end
1717

1818
it "sets enabled_for_model? to false" do
19-
expect(PaperTrail.request.enabled_for_model?(Widget)).to be(true)
19+
expect(PaperTrail.request.enabled_for_model?(Widget)).to eq(true)
2020
PaperTrail.request.disable_model(Widget)
21-
expect(PaperTrail.request.enabled_for_model?(Widget)).to be(false)
21+
expect(PaperTrail.request.enabled_for_model?(Widget)).to eq(false)
2222
end
2323
end
2424

@@ -29,15 +29,15 @@ module PaperTrail
2929

3030
it "sets enabled_for_model? to true" do
3131
PaperTrail.request.enabled_for_model(Widget, false)
32-
expect(PaperTrail.request.enabled_for_model?(Widget)).to be(false)
32+
expect(PaperTrail.request.enabled_for_model?(Widget)).to eq(false)
3333
PaperTrail.request.enabled_for_model(Widget, true)
34-
expect(PaperTrail.request.enabled_for_model?(Widget)).to be(true)
34+
expect(PaperTrail.request.enabled_for_model?(Widget)).to eq(true)
3535
end
3636
end
3737

3838
describe ".enabled?" do
3939
it "returns true" do
40-
expect(PaperTrail.request.enabled?).to be(true)
40+
expect(PaperTrail.request.enabled?).to eq(true)
4141
end
4242
end
4343

@@ -48,9 +48,9 @@ module PaperTrail
4848

4949
it "sets enabled? to true" do
5050
PaperTrail.request.enabled = true
51-
expect(PaperTrail.request.enabled?).to be(true)
51+
expect(PaperTrail.request.enabled?).to eq(true)
5252
PaperTrail.request.enabled = false
53-
expect(PaperTrail.request.enabled?).to be(false)
53+
expect(PaperTrail.request.enabled?).to eq(false)
5454
end
5555
end
5656

@@ -78,9 +78,9 @@ module PaperTrail
7878

7979
it "sets enabled_for_model? to true" do
8080
PaperTrail.request.disable_model(Widget)
81-
expect(PaperTrail.request.enabled_for_model?(Widget)).to be(false)
81+
expect(PaperTrail.request.enabled_for_model?(Widget)).to eq(false)
8282
PaperTrail.request.enable_model(Widget)
83-
expect(PaperTrail.request.enabled_for_model?(Widget)).to be(true)
83+
expect(PaperTrail.request.enabled_for_model?(Widget)).to eq(true)
8484
end
8585
end
8686

Diff for: spec/paper_trail_spec.rb

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111

1212
describe "#config", versioning: true do
1313
it "allows for config values to be set" do
14-
expect(described_class.config.enabled).to be(true)
14+
expect(described_class.config.enabled).to eq(true)
1515
described_class.config.enabled = false
16-
expect(described_class.config.enabled).to be(false)
16+
expect(described_class.config.enabled).to eq(false)
1717
end
1818

1919
it "accepts blocks and yield the config instance" do
20-
expect(described_class.config.enabled).to be(true)
20+
expect(described_class.config.enabled).to eq(true)
2121
described_class.config { |c| c.enabled = false }
22-
expect(described_class.config.enabled).to be(false)
22+
expect(described_class.config.enabled).to eq(false)
2323
end
2424
end
2525

@@ -46,7 +46,7 @@
4646

4747
it "affects all threads" do
4848
Thread.new { described_class.enabled = false }.join
49-
expect(described_class.enabled?).to be(false)
49+
expect(described_class.enabled?).to eq(false)
5050
end
5151
end
5252

0 commit comments

Comments
 (0)