Skip to content

Commit b03a9eb

Browse files
committed
update to non-predicate method for rubocop
we used to just return true or false, but we are using nil to signify that the submitter uuid is not found for the controller so the error can be surfaced to the user.
1 parent 1f5af49 commit b03a9eb

3 files changed

Lines changed: 15 additions & 15 deletions

File tree

app/controllers/submit_form_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def show
2222

2323
if @form_configs[:enforce_signing_order] ||
2424
submission.template_signing_order.in?(%w[employee_then_manager manager_then_employee])
25-
signing_order = Submitters.current_submitter_order?(@submitter)
25+
signing_order = Submitters.current_submitter_order(@submitter)
2626

2727
if signing_order.nil?
2828
flash.now[:alert] = I18n.t('user_id_did_not_match_please_try_again_or_contact_support')

lib/submitters.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ def send_signature_requests(submitters, delay_seconds: nil)
162162
end
163163
end
164164

165-
def current_submitter_order?(submitter)
165+
def current_submitter_order(submitter)
166166
submitter_items = submitter.submission.template_submitters || submitter.submission.template.submitters
167167
submitters_order = submitter.submission.template_signing_order
168168

spec/lib/submitters_spec.rb

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
require 'rails_helper'
44

55
RSpec.describe Submitters do
6-
describe '.current_submitter_order?' do
6+
describe '.current_submitter_order' do
77
let(:account) { create(:account) }
88
let(:user) { create(:user, account:) }
99
let(:template) { create(:template, account:, author: user, submitter_count: 2) }
@@ -24,71 +24,71 @@ def update_order(order)
2424
before { update_order('manager_then_employee') }
2525

2626
it 'returns true for the manager (index 1)' do
27-
expect(described_class.current_submitter_order?(manager.reload)).to be true
27+
expect(described_class.current_submitter_order(manager.reload)).to be true
2828
end
2929

3030
it 'returns false for the employee when manager has not completed' do
3131
manager.update!(completed_at: nil)
32-
expect(described_class.current_submitter_order?(employee.reload)).to be false
32+
expect(described_class.current_submitter_order(employee.reload)).to be false
3333
end
3434

3535
it 'returns true for the employee when manager has completed' do
3636
manager.update!(completed_at: Time.current)
37-
expect(described_class.current_submitter_order?(employee.reload)).to be true
37+
expect(described_class.current_submitter_order(employee.reload)).to be true
3838
end
3939
end
4040

4141
context 'with employee_then_manager order' do
4242
before { update_order('employee_then_manager') }
4343

4444
it 'returns true for the first submitter (Employee)' do
45-
expect(described_class.current_submitter_order?(employee.reload)).to be true
45+
expect(described_class.current_submitter_order(employee.reload)).to be true
4646
end
4747

4848
it 'returns false for the manager when employee has not completed' do
4949
employee.update!(completed_at: nil)
50-
expect(described_class.current_submitter_order?(manager.reload)).to be false
50+
expect(described_class.current_submitter_order(manager.reload)).to be false
5151
end
5252

5353
it 'returns true for the manager when employee has completed' do
5454
employee.update!(completed_at: Time.current)
55-
expect(described_class.current_submitter_order?(manager.reload)).to be true
55+
expect(described_class.current_submitter_order(manager.reload)).to be true
5656
end
5757
end
5858

5959
context 'with simultaneous order' do
6060
before { update_order('simultaneous') }
6161

6262
it 'returns true for the first submitter' do
63-
expect(described_class.current_submitter_order?(employee.reload)).to be true
63+
expect(described_class.current_submitter_order(employee.reload)).to be true
6464
end
6565

6666
it 'returns true for the second submitter when the first has completed' do
6767
employee.update!(completed_at: Time.current)
68-
expect(described_class.current_submitter_order?(manager.reload)).to be true
68+
expect(described_class.current_submitter_order(manager.reload)).to be true
6969
end
7070

7171
it 'returns false for the second submitter when the first has not completed' do
7272
employee.update!(completed_at: nil)
73-
expect(described_class.current_submitter_order?(manager.reload)).to be false
73+
expect(described_class.current_submitter_order(manager.reload)).to be false
7474
end
7575
end
7676

7777
context 'with single_sided order' do
7878
before { update_order('single_sided') }
7979

8080
it 'returns true for the first submitter' do
81-
expect(described_class.current_submitter_order?(employee.reload)).to be true
81+
expect(described_class.current_submitter_order(employee.reload)).to be true
8282
end
8383

8484
it 'returns true for the second submitter when the first has completed' do
8585
employee.update!(completed_at: Time.current)
86-
expect(described_class.current_submitter_order?(manager.reload)).to be true
86+
expect(described_class.current_submitter_order(manager.reload)).to be true
8787
end
8888

8989
it 'returns false for the second submitter when the first has not completed' do
9090
employee.update!(completed_at: nil)
91-
expect(described_class.current_submitter_order?(manager.reload)).to be false
91+
expect(described_class.current_submitter_order(manager.reload)).to be false
9292
end
9393
end
9494
end

0 commit comments

Comments
 (0)