File tree 3 files changed +8
-23
lines changed
3 files changed +8
-23
lines changed Original file line number Diff line number Diff line change 18
18
bundler-cache : true
19
19
- run : bin/bundle --jobs=$(nproc) --retry=$(nproc)
20
20
- run : bin/rubocop -P
21
-
22
- reek :
23
- runs-on : ubuntu-latest
24
- strategy :
25
- fail-fast : true
26
-
27
- steps :
28
- - uses : actions/checkout@v3
29
- - uses : ruby/setup-ruby@v1
30
- with :
31
- ruby-version : 3.1
32
- bundler : 2.4.12
33
- bundler-cache : true
34
- - run : bin/bundle --jobs=$(nproc) --retry=$(nproc)
35
- - run : bin/reek .
Original file line number Diff line number Diff line change @@ -113,19 +113,19 @@ def errors_as_string
113
113
114
114
# the strategy to use as conflict resolution from sidekiq client
115
115
def on_client_conflict
116
- if on_conflict . is_a? ( Hash )
117
- @on_client_conflict ||= on_conflict [ "client" ] || on_conflict [ :client ]
116
+ @on_client_conflict ||= if on_conflict . is_a? ( Hash )
117
+ on_conflict [ "client" ] || on_conflict [ :client ]
118
118
else
119
- @on_client_conflict ||= on_conflict
119
+ on_conflict
120
120
end
121
121
end
122
122
123
123
# the strategy to use as conflict resolution from sidekiq server
124
124
def on_server_conflict
125
- if on_conflict . is_a? ( Hash )
126
- @on_server_conflict ||= on_conflict [ "server" ] || on_conflict [ :server ]
125
+ @on_server_conflict ||= if on_conflict . is_a? ( Hash )
126
+ on_conflict [ "server" ] || on_conflict [ :server ]
127
127
else
128
- @on_server_conflict ||= on_conflict
128
+ on_conflict
129
129
end
130
130
end
131
131
end
Original file line number Diff line number Diff line change 148
148
end
149
149
150
150
context "when on_conflict is defined only for server" do
151
- let ( :on_conflict ) { { server : :log } }
151
+ let ( :on_conflict ) { { server : :log } }
152
152
153
153
it { is_expected . to be_nil }
154
154
end
166
166
end
167
167
168
168
context "when on_conflict is defined only for client" do
169
- let ( :on_conflict ) { { client : :log } }
169
+ let ( :on_conflict ) { { client : :log } }
170
170
171
171
it { is_expected . to be_nil }
172
172
end
You can’t perform that action at this time.
0 commit comments