Skip to content
Snippets Groups Projects
Commit 7a162e1a authored by Sanad Liaquat's avatar Sanad Liaquat
Browse files

CE Backport of EE changes

Add qa selector elements and files from the EE branch
parent 4d4e88df
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -14,7 +14,7 @@
.settings-content
= render 'groups/settings/general'
 
%section.settings.gs-permissions.no-animate#js-permissions-settings{ class: ('expanded' if expanded) }
%section.settings.gs-permissions.no-animate#js-permissions-settings{ class: ('expanded' if expanded), data: { qa_selector: 'permission_lfs_2fa_section' } }
.settings-header
%h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only{ role: 'button' }
= _('Permissions, LFS, 2FA')
Loading
Loading
Loading
Loading
@@ -31,4 +31,4 @@
= render 'groups/settings/two_factor_auth', f: f
= render_if_exists 'groups/member_lock_setting', f: f, group: @group
 
= f.submit _('Save changes'), class: 'btn btn-success prepend-top-default js-dirty-submit'
= f.submit _('Save changes'), class: 'btn btn-success prepend-top-default js-dirty-submit', data: { qa_selector: 'save_permissions_changes_button' }
Loading
Loading
@@ -147,7 +147,7 @@
= _('Settings')
%li.divider.fly-out-top-item
= nav_link(path: 'groups#edit') do
= link_to edit_group_path(@group), title: _('General') do
= link_to edit_group_path(@group), title: _('General'), data: { qa_selector: 'general_settings_link' } do
%span
= _('General')
 
Loading
Loading
Loading
Loading
@@ -160,6 +160,10 @@ module QA
module Group
autoload :New, 'qa/page/group/new'
autoload :Show, 'qa/page/group/show'
module Settings
autoload :General, 'qa/page/group/settings/general'
end
end
 
module File
Loading
Loading
# frozen_string_literal: true
module QA
module Page
module Group
module Settings
class General < QA::Page::Base
view 'app/views/groups/edit.html.haml' do
element :permission_lfs_2fa_section
end
view 'app/views/groups/settings/_permissions.html.haml' do
element :save_permissions_changes_button
end
end
end
end
end
end
Loading
Loading
@@ -7,7 +7,7 @@ module QA
# creating it if it doesn't yet exist.
#
class Sandbox < Base
attr_reader :path
attr_accessor :path
 
attribute :id
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment