-
Notifications
You must be signed in to change notification settings - Fork 434
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #6312 from vpereira/create_api_endpoints_for_stagi…
…ng_project Add XML endpoint for StagingProjectsController#show action
- Loading branch information
Showing
10 changed files
with
149 additions
and
4 deletions.
There are no files selected for viewing
7 changes: 7 additions & 0 deletions
7
src/api/app/controllers/staging/staging_projects_controller.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
class Staging::StagingProjectsController < ApplicationController | ||
skip_before_action :require_login | ||
|
||
def show | ||
@staging_project = Staging::StagingProject.find_by!(name: params[:name]) | ||
end | ||
end |
5 changes: 5 additions & 0 deletions
5
src/api/app/views/staging/staging_projects/_broken_packages.xml.builder
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
builder.broken_package(count: count) do |broken_package| | ||
broken_packages.each do |package| | ||
broken_package.entry(package: package[:package], project: package[:project]) | ||
end | ||
end |
6 changes: 6 additions & 0 deletions
6
src/api/app/views/staging/staging_projects/_building_repositories.xml.builder
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
xml.building_repositories(count: count) do |building_repository| | ||
building_repositories.each do |repo| | ||
# missing , tobuild: repo[''], final: repo[''] | ||
building_repository.entry(name: repo['repository'], arch: repo['arch'], code: repo['code'], state: repo['state']) | ||
end | ||
end |
5 changes: 5 additions & 0 deletions
5
src/api/app/views/staging/staging_projects/_missing_reviews.xml.builder
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
builder.missing_reviews(count: count) do |missing_review| | ||
missing_reviews.each do |bs_request| | ||
missing_review.entry(id: bs_request[:id], creator: bs_request[:by], state: bs_request[:state], package: bs_request[:package]) | ||
end | ||
end |
5 changes: 5 additions & 0 deletions
5
src/api/app/views/staging/staging_projects/_requests_to_review.xml.builder
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
builder.requests_to_review(count: count) do | ||
requests_to_review.each do |bs_request| | ||
builder.entry(id: bs_request.number, creator: bs_request.creator, state: bs_request.state, package: bs_request.first_target_package) | ||
end | ||
end |
5 changes: 5 additions & 0 deletions
5
src/api/app/views/staging/staging_projects/_staged_requests.xml.builder
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
builder.staged_requests(count: count) do |staged_request| | ||
staged_requests.each do |bs_request| | ||
staged_request.entry(id: bs_request.number, creator: bs_request.creator, state: bs_request.state, package: bs_request.first_target_package) | ||
end | ||
end |
5 changes: 5 additions & 0 deletions
5
src/api/app/views/staging/staging_projects/_untracked_requests.xml.builder
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
builder.untracked_requests(count: count) do |untracked_request| | ||
untracked_requests.each do |bs_request| | ||
untracked_request.entry(id: bs_request.number, creator: bs_request.creator, state: bs_request.state, package: bs_request.first_target_package) | ||
end | ||
end |
13 changes: 13 additions & 0 deletions
13
src/api/app/views/staging/staging_projects/show.xml.builder
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
xml.staging_project(name: @staging_project.name) do | ||
render(partial: 'staged_requests', locals: { staged_requests: @staging_project.staged_requests, count: @staging_project.staged_requests.count, builder: xml }) | ||
|
||
render(partial: 'untracked_requests', locals: { untracked_requests: @staging_project.untracked_requests, count: @staging_project.untracked_requests.count, builder: xml }) | ||
|
||
render(partial: 'requests_to_review', locals: { requests_to_review: @staging_project.requests_to_review, count: @staging_project.requests_to_review.count, builder: xml }) | ||
|
||
render(partial: 'missing_reviews', locals: { missing_reviews: @staging_project.missing_reviews, count: @staging_project.missing_reviews.count, builder: xml }) | ||
|
||
render(partial: 'building_repositories', locals: { building_repositories: @staging_project.building_repositories, count: @staging_project.building_repositories.count, builder: xml }) | ||
|
||
render(partial: 'broken_packages', locals: { broken_packages: @staging_project.broken_packages, count: @staging_project.broken_packages.count, builder: xml }) | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
93 changes: 93 additions & 0 deletions
93
src/api/spec/controllers/staging/staging_projects_controller_spec.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,93 @@ | ||
require 'rails_helper' | ||
|
||
RSpec.describe Staging::StagingProjectsController, type: :controller do | ||
render_views | ||
|
||
let(:user) { create(:confirmed_user, login: 'permitted_user') } | ||
let(:project) { user.home_project } | ||
let(:staging_workflow) { create(:staging_workflow_with_staging_projects, project: project) } | ||
let(:staging_project) { staging_workflow.staging_projects.first } | ||
let(:source_project) { create(:project, name: 'source_project') } | ||
let(:target_package) { create(:package, name: 'target_package', project: project) } | ||
let(:source_package) { create(:package, name: 'source_package', project: source_project) } | ||
|
||
describe 'GET #show' do | ||
context 'not existing project' do | ||
before do | ||
get :show, params: { name: 'does-not-exist', format: :xml } | ||
end | ||
|
||
it { expect(response).to have_http_status(:not_found) } | ||
end | ||
|
||
context 'valid project' do | ||
let(:broken_packages_backend) do | ||
<<~XML | ||
<resultlist state="e9e2a9641ea83ac9c8786c24ca57dc6f"> | ||
<result project="home:foo:Staging:A" repository="openSUSE_Tumbleweed" arch="i586" code="published" state="published"> | ||
<status package="barbar" code="failed" /> | ||
</result> | ||
<result project="home:foo:Staging:A" repository="openSUSE_Tumbleweed" arch="x86_64" code="published" state="published"> | ||
<status package="barbar" code="failed" /> | ||
</result> | ||
</resultlist> | ||
XML | ||
end | ||
let(:broken_packages_path) { "#{CONFIG['source_url']}/build/#{staging_project.name}/_result?code=failed&code=broken&code=unresolvable" } | ||
|
||
let(:request_attributes) do | ||
{ | ||
target_project: project.name, | ||
target_package: target_package.name, | ||
source_project: source_project.name, | ||
source_package: source_package.name | ||
} | ||
end | ||
|
||
let!(:bs_request) do | ||
create(:bs_request_with_submit_action, request_attributes.merge(creator: user, staging_project: staging_project)) | ||
end | ||
|
||
let(:untracked_review) { create(:review, by_project: staging_project) } | ||
let!(:untracked_request) do | ||
create(:bs_request_with_submit_action, request_attributes.merge(creator: user, reviews: [untracked_review])) | ||
end | ||
|
||
let(:review) { create(:review, by_project: staging_project) } | ||
let!(:bs_request_to_review) do | ||
create(:bs_request_with_submit_action, request_attributes.merge(creator: user, reviews: [review], staging_project: staging_project)) | ||
end | ||
|
||
let(:missing_review) { create(:review, by_user: user) } | ||
let!(:bs_request_missing_review) do | ||
create(:bs_request_with_submit_action, request_attributes.merge(creator: user, reviews: [missing_review], staging_project: staging_project)) | ||
end | ||
|
||
before do | ||
stub_request(:get, broken_packages_path).and_return(body: broken_packages_backend) | ||
get :show, params: { name: staging_project.name, format: :xml } | ||
end | ||
|
||
it { expect(response).to have_http_status(:success) } | ||
it 'returns the staging_project name xml' do | ||
assert_select 'staging_project' do | ||
assert_select 'staged_requests', 1 do | ||
assert_select 'entry', 3 | ||
end | ||
assert_select 'untracked_requests', 1 do | ||
assert_select 'entry', 1 | ||
end | ||
assert_select 'requests_to_review', 1 do | ||
assert_select 'entry', 2 | ||
end | ||
assert_select 'missing_reviews', 1 do | ||
assert_select 'entry', 1 | ||
end | ||
assert_select 'broken_package', 1 do | ||
assert_select 'entry', 2 | ||
end | ||
end | ||
end | ||
end | ||
end | ||
end |