Skip to content

Commit 7af9260

Browse files
eduardojsaraycp
authored andcommitted
Write to both bs_requests columns state and status
These changes were missing in 1d76f7b. Luckily, they only affected the test and development environmnents.
1 parent 59027a4 commit 7af9260

File tree

6 files changed

+9
-5
lines changed

6 files changed

+9
-5
lines changed

src/api/lib/tasks/dev/rake_support.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ def self.request_for_staging(staging_project, maintainer_project, suffix)
3131
request = create(
3232
:bs_request_with_submit_action,
3333
state: :new,
34+
status: :new,
3435
creator: requester,
3536
target_package: target_package,
3637
source_package: source_package,

src/api/lib/tasks/dev/requests.rake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,8 @@ namespace :dev do
322322
bs_request: {
323323
description: "Bs request ##{req['id']}",
324324
creator: alias_for_login(req['creator']),
325-
state: req['state']['name']
325+
state: req['state']['name'],
326+
status: req['state']['name']
326327
},
327328
bs_request_actions: {
328329
target_project: 'openSUSE:Factory',

src/api/spec/controllers/webui/groups/bs_requests_controller_spec.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,10 @@
7272
before do
7373
login user
7474
bs_request.state = :review
75+
bs_request.status = :review
7576
bs_request.save
7677
another_bs_request.state = :review
78+
another_bs_request.status = :review
7779
another_bs_request.save
7880
get :index, params: params
7981
end

src/api/spec/features/webui/requests_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@
329329
end
330330

331331
it 'when request is in a final state' do
332-
bs_request.update(state: :accepted)
332+
bs_request.update(status: :accepted)
333333
visit request_show_path(bs_request)
334334
expect(page).to have_text("Auto-accept was set to #{I18n.l(bs_request.accept_at, format: :only_date)}.")
335335
end
@@ -369,7 +369,7 @@
369369

370370
describe 'for a request with a deleted target project' do
371371
let!(:delete_bs_request) do
372-
create(:delete_bs_request, target_project: target_project, description: 'a long text - ' * 200, creator: submitter, state: :accepted)
372+
create(:delete_bs_request, target_project: target_project, description: 'a long text - ' * 200, creator: submitter, status: :accepted)
373373
end
374374

375375
before do

src/api/spec/models/project/staging_project_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393

9494
context 'when request got revoked' do
9595
before do
96-
submit_request.update(state: 'revoked')
96+
submit_request.update(status: 'revoked')
9797
end
9898

9999
it { expect(staging_project.overall_state).to eq(:unacceptable) }

src/api/spec/models/workflow/step/submit_request_step_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
expect do
7676
subject.call
7777
bs_request.reload
78-
end.to(change(bs_request, :state).from(:new).to(:revoked))
78+
end.to(change(bs_request, :status).from('new').to('revoked'))
7979
expect { subject.call }.not_to change(BsRequest, :count)
8080
end
8181
end

0 commit comments

Comments
 (0)