Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/api/lib/tasks/dev/rake_support.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ def self.request_for_staging(staging_project, maintainer_project, suffix)
request = create(
:bs_request_with_submit_action,
state: :new,
status: :new,
creator: requester,
target_package: target_package,
source_package: source_package,
Expand Down
3 changes: 2 additions & 1 deletion src/api/lib/tasks/dev/requests.rake
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,8 @@ namespace :dev do
bs_request: {
description: "Bs request ##{req['id']}",
creator: alias_for_login(req['creator']),
state: req['state']['name']
state: req['state']['name'],
status: req['state']['name']
},
bs_request_actions: {
target_project: 'openSUSE:Factory',
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,10 @@
before do
login user
bs_request.state = :review
bs_request.status = :review
bs_request.save
another_bs_request.state = :review
another_bs_request.status = :review
another_bs_request.save
get :index, params: params
end
Expand Down
4 changes: 2 additions & 2 deletions src/api/spec/features/webui/requests_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@
end

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

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

before do
Expand Down
2 changes: 1 addition & 1 deletion src/api/spec/models/project/staging_project_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@

context 'when request got revoked' do
before do
submit_request.update(state: 'revoked')
submit_request.update(state: 'revoked', status: 'revoked')
end

it { expect(staging_project.overall_state).to eq(:unacceptable) }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
expect do
subject.call
bs_request.reload
end.to(change(bs_request, :state).from(:new).to(:revoked))
end.to(change(bs_request, :status).from('new').to('revoked'))
expect { subject.call }.not_to change(BsRequest, :count)
end
end
Expand Down