Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[src/api] Update haml_lint 0.59.0 → 0.60.0 (major) #17328

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
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
2 changes: 1 addition & 1 deletion src/api/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ GEM
activesupport (>= 5.1)
haml (>= 4.0.6)
railties (>= 5.1)
haml_lint (0.59.0)
haml_lint (0.60.0)
haml (>= 5.0)
parallel (~> 1.10)
rainbow
Expand Down
2 changes: 1 addition & 1 deletion src/api/app/views/webui/request/_actions_details.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@

- if %w[add_role set_bugowner].include?(action.type)
:ruby
parameters = { project: action.target_project, request_action_id: action.id, notification_id: @current_notification }
parameters = { project: action.target_project, request_action_id: action.id, notification_id: current_notification }
roles_link = if action.target_package
package_users_path(parameters.merge!(package: action.target_package))
else
Expand Down
3 changes: 2 additions & 1 deletion src/api/app/views/webui/request/_request_header.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@
= render partial: 'actions_details', locals: { bs_request: bs_request, action: action,
prev_action: prev_action, next_action: next_action,
actions: actions, diff_to_superseded_id: diff_to_superseded_id,
page_name: page_name }
page_name: page_name, notification_id: current_notification,
current_notification: current_notification}
- if Flipper.enabled?(:labels, User.session)
.mt-4
= render partial: 'webui/shared/label', collection: bs_request.labels, as: :label
Expand Down
3 changes: 2 additions & 1 deletion src/api/app/views/webui/request/beta_show.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
= render partial: 'request_header',
locals: { bs_request: @bs_request, staging_status: @staging_status, action: @action,
prev_action: @prev_action, next_action: @next_action, actions: @actions,
diff_to_superseded_id: @diff_to_superseded_id, page_name: '' }
diff_to_superseded_id: @diff_to_superseded_id, page_name: '',
current_notification: @current_notification }
= render partial: 'request_tabs',
locals: { bs_request: @bs_request, action: @action, issues: @issues,
actions_count: @actions.count, active_tab: @active_tab }
Expand Down
3 changes: 2 additions & 1 deletion src/api/app/views/webui/request/build_results.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
locals: { bs_request: @bs_request, staging_status: @staging_status, action: @action,
prev_action: @prev_action, next_action: @next_action, actions: @actions,
diff_to_superseded_id: @diff_to_superseded_id, page_name: 'request_build_results',
bs_requests: @watched_requests, packages: @watched_packages, projects: @watched_projects }
bs_requests: @watched_requests, packages: @watched_packages, projects: @watched_projects,
current_notification: @current_notification }
= render partial: 'request_tabs',
locals: { bs_request: @bs_request, action: @action, issues: @issues,
actions_count: @actions.count, active_tab: @active_tab }
Expand Down
3 changes: 2 additions & 1 deletion src/api/app/views/webui/request/changes.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
locals: { bs_request: @bs_request, staging_status: @staging_status, action: @action,
prev_action: @prev_action, next_action: @next_action, actions: @actions,
diff_to_superseded_id: @diff_to_superseded_id, page_name: 'request_changes',
bs_requests: @watched_requests, packages: @watched_packages, projects: @watched_projects }
bs_requests: @watched_requests, packages: @watched_packages, projects: @watched_projects,
current_notification: @current_notification }
= render partial: 'request_tabs',
locals: { bs_request: @bs_request, action: @action, issues: @issues,
actions_count: @actions.count, active_tab: @active_tab }
Expand Down
3 changes: 2 additions & 1 deletion src/api/app/views/webui/request/mentioned_issues.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
locals: { bs_request: @bs_request, staging_status: @staging_status, action: @action,
prev_action: @prev_action, next_action: @next_action, actions: @actions,
diff_to_superseded_id: @diff_to_superseded_id, page_name: 'request_mentioned_issues',
bs_requests: @watched_requests, packages: @watched_packages, projects: @watched_projects }
bs_requests: @watched_requests, packages: @watched_packages, projects: @watched_projects,
current_notification: @current_notification }
= render partial: 'request_tabs',
locals: { bs_request: @bs_request, action: @action, issues: @issues,
actions_count: @actions.count, active_tab: @active_tab }
Expand Down
3 changes: 2 additions & 1 deletion src/api/app/views/webui/request/rpm_lint.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
locals: { bs_request: @bs_request, staging_status: @staging_status, action: @action,
prev_action: @prev_action, next_action: @next_action, actions: @actions,
diff_to_superseded_id: @diff_to_superseded_id, page_name: 'request_rpm_lint',
bs_requests: @watched_requests, packages: @watched_packages, projects: @watched_projects }
bs_requests: @watched_requests, packages: @watched_packages, projects: @watched_projects,
current_notification: @current_notification }
= render partial: 'request_tabs',
locals: { bs_request: @bs_request, action: @action, issues: @issues,
actions_count: @actions.count, active_tab: @active_tab }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
link_to("#{item[:package]} by #{item[:by]}", request_show_path(item[:request]))
when 'building_repositories'
link_to("#{item['repository']}-#{item['arch']} (#{item['state']})",
project_repository_state_path(project: @staging_project.name, repository: item['repository']))
project_repository_state_path(project: staging_project.name, repository: item['repository']))
end
28 changes: 28 additions & 0 deletions src/api/spec/features/beta/webui/requests_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
require 'browser_helper'

RSpec.describe 'Requests' do
let(:submitter) { create(:confirmed_user, :with_home, login: 'kugelblitz') }
let(:receiver) { create(:confirmed_user, :with_home, login: 'titan') }
let(:target_project) { receiver.home_project }

context 'for role addition user' do
describe 'for projects' do
before do
login submitter
visit project_show_path(project: target_project)
desktop? ? click_on('Request Role Addition') : click_menu_link('Actions', 'Request Role Addition')
choose 'Bugowner'
choose 'User'
fill_in 'User:', with: submitter.login.to_s
fill_in 'Description:', with: 'I can fix bugs too.'
end

it 'can be submitted' do
expect { click_on('Request') }.to change(BsRequest, :count).by(1)
expect(page).to have_text("#{submitter.realname} (#{submitter.login}) wants to get the role bugowner for project #{target_project}")
expect(page).to have_css('#description-text', text: 'I can fix bugs too.')
expect(page).to have_css('.badge', text: 'new')
end
end
end
end
Binary file removed src/api/vendor/cache/haml_lint-0.59.0.gem
Binary file not shown.
Binary file added src/api/vendor/cache/haml_lint-0.60.0.gem
Binary file not shown.