BigW Consortium Gitlab

Commit 875ce488 by Filipa Lacerda Committed by James Edwards-Jones

Merge branch 'fix-oauth-checkboxes' into 'master'

Fixed sign-in restrictions buttons not toggling active state Closes #35882 See merge request !13270
parent 030d7091
...@@ -8,6 +8,7 @@ import 'bootstrap-sass/assets/javascripts/bootstrap/modal'; ...@@ -8,6 +8,7 @@ import 'bootstrap-sass/assets/javascripts/bootstrap/modal';
import 'bootstrap-sass/assets/javascripts/bootstrap/tab'; import 'bootstrap-sass/assets/javascripts/bootstrap/tab';
import 'bootstrap-sass/assets/javascripts/bootstrap/transition'; import 'bootstrap-sass/assets/javascripts/bootstrap/transition';
import 'bootstrap-sass/assets/javascripts/bootstrap/tooltip'; import 'bootstrap-sass/assets/javascripts/bootstrap/tooltip';
import 'bootstrap-sass/assets/javascripts/bootstrap/button';
// custom jQuery functions // custom jQuery functions
$.fn.extend({ $.fn.extend({
......
---
title: Fixed sign-in restrictions buttons not toggling active state
merge_request:
author:
...@@ -69,6 +69,14 @@ feature 'Admin updates settings', feature: true do ...@@ -69,6 +69,14 @@ feature 'Admin updates settings', feature: true do
expect(find('#service_push_channel').value).to eq '#test_channel' expect(find('#service_push_channel').value).to eq '#test_channel'
end end
context 'sign-in restrictions', :js do
it 'de-activates oauth sign-in source' do
find('.btn', text: 'GitLab.com').click
expect(find('.btn', text: 'GitLab.com')).not_to have_css('.active')
end
end
def check_all_events def check_all_events
page.check('Active') page.check('Active')
page.check('Push') page.check('Push')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment