Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2018-04-04 12:44:32 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2018-04-04 12:44:32 +0300
commit442528e57775751afc517ab7c247de99e95bbadf (patch)
tree3fda297eefc2ff954166816d39aa2f783ddb7cbb /spec/features/admin
parent242345a0251082d851461f8066e3b0dce26203ac (diff)
Move the rest of application settings to expandable blocks
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'spec/features/admin')
-rw-r--r--spec/features/admin/admin_settings_spec.rb24
1 files changed, 22 insertions, 2 deletions
diff --git a/spec/features/admin/admin_settings_spec.rb b/spec/features/admin/admin_settings_spec.rb
index 3005d74c3cf..846b8040be6 100644
--- a/spec/features/admin/admin_settings_spec.rb
+++ b/spec/features/admin/admin_settings_spec.rb
@@ -123,7 +123,7 @@ feature 'Admin updates settings' do
scenario 'Change Performance bar settings' do
group = create(:group)
- page.within('.as-performance') do
+ page.within('.as-performance-bar') do
check 'Enable the Performance Bar'
fill_in 'Allowed group', with: group.path
click_on 'Save changes'
@@ -133,7 +133,7 @@ feature 'Admin updates settings' do
expect(find_field('Enable the Performance Bar')).to be_checked
expect(find_field('Allowed group').value).to eq group.path
- page.within('.as-performance') do
+ page.within('.as-performance-bar') do
uncheck 'Enable the Performance Bar'
click_on 'Save changes'
end
@@ -167,6 +167,26 @@ feature 'Admin updates settings' do
expect(Gitlab::CurrentSettings.unique_ips_limit_per_user).to eq(15)
end
+ scenario 'Configure web terminal' do
+ page.within('.as-terminal') do
+ fill_in 'Max session time', with: 15
+ click_button 'Save changes'
+ end
+
+ expect(page).to have_content "Application settings saved successfully"
+ expect(Gitlab::CurrentSettings.terminal_max_session_time).to eq(15)
+ end
+
+ scenario 'Enable outbound requests' do
+ page.within('.as-outbound') do
+ check 'Allow requests to the local network from hooks and services'
+ click_button 'Save changes'
+ end
+
+ expect(page).to have_content "Application settings saved successfully"
+ expect(Gitlab::CurrentSettings.allow_local_requests_from_hooks_and_services).to be true
+ end
+
scenario 'Change Slack Notifications Service template settings' do
first(:link, 'Service Templates').click
click_link 'Slack notifications'