kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'tp-qtt182-8' into 'master'

Browse source 
Change qa-* class references to rspec-* for repository settings

Closes gitlab-org/quality/team-tasks#182

See merge request gitlab-org/gitlab-ce!31210
This commit is contained in:
Mayra Cabrera 2019-07-29 19:15:17 +00:00
commit 1fac96c149
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/projects/mirrors/_disabled_mirror_badge.html.haml
View file

@ -1 +1 @@
.badge.badge-warning.qa-disabled-mirror-badge{ data: { toggle: 'tooltip', html: 'true' }, title: _('Disabled mirrors can only be enabled by instance owners. It is recommended that you delete them.') }= _('Disabled')
.badge.badge-warning.qa-disabled-mirror-badge.rspec-disabled-mirror-badge{ data: { toggle: 'tooltip', html: 'true' }, title: _('Disabled mirrors can only be enabled by instance owners. It is recommended that you delete them.') }= _('Disabled')

4
app/views/projects/mirrors/_mirror_repos.html.haml
View file

@ -50,7 +50,7 @@
= render_if_exists 'projects/mirrors/table_pull_row'
- @project.remote_mirrors.each_with_index do |mirror, index|
- next if mirror.new_record?
%tr.qa-mirrored-repository-row{ class: ('bg-secondary' if mirror.disabled?) }
%tr.qa-mirrored-repository-row.rspec-mirrored-repository-row{ class: ('bg-secondary' if mirror.disabled?) }
%td.qa-mirror-repository-url= mirror.safe_url
%td= _('Push')
%td.qa-mirror-last-update-at= mirror.last_update_at.present? ? time_ago_with_tooltip(mirror.last_update_at) : _('Never')
@ -64,4 +64,4 @@
- if mirror.ssh_key_auth?
= clipboard_button(text: mirror.ssh_public_key, class: 'btn btn-default', title: _('Copy SSH public key'))
= render 'shared/remote_mirror_update_button', remote_mirror: mirror
%button.js-delete-mirror.qa-delete-mirror.btn.btn-danger{ type: 'button', data: { mirror_id: mirror.id, toggle: 'tooltip', container: 'body' }, title: _('Remove') }= icon('trash-o')
%button.js-delete-mirror.qa-delete-mirror.rspec-delete-mirror.btn.btn-danger{ type: 'button', data: { mirror_id: mirror.id, toggle: 'tooltip', container: 'body' }, title: _('Remove') }= icon('trash-o')

2
app/views/shared/_remote_mirror_update_button.html.haml
View file

@ -2,5 +2,5 @@
%button.btn.disabled{ type: 'button', data: { toggle: 'tooltip', container: 'body' }, title: _('Updating') }
= icon("refresh spin")
- elsif remote_mirror.enabled?
= link_to update_now_project_mirror_path(@project, sync_remote: true), method: :post, class: "btn qa-update-now-button", data: { toggle: 'tooltip', container: 'body' }, title: _('Update now') do
= link_to update_now_project_mirror_path(@project, sync_remote: true), method: :post, class: "btn qa-update-now-button rspec-update-now-button", data: { toggle: 'tooltip', container: 'body' }, title: _('Update now') do
= icon("refresh")

8
spec/features/projects/settings/repository_settings_spec.rb
View file

@ -250,11 +250,11 @@ describe 'Projects > Settings > Repository settings' do
visit project_settings_repository_path(project)
mirror = find('.qa-mirrored-repository-row')
mirror = find('.rspec-mirrored-repository-row')
expect(mirror).to have_selector('.qa-delete-mirror')
expect(mirror).to have_selector('.qa-disabled-mirror-badge')
expect(mirror).not_to have_selector('.qa-update-now-button')
expect(mirror).to have_selector('.rspec-delete-mirror')
expect(mirror).to have_selector('.rspec-disabled-mirror-badge')
expect(mirror).not_to have_selector('.rspec-update-now-button')
end
end
end