Merge branch 'fix-oauth-checkboxes' into 'master'
Fixed sign-in restrictions buttons not toggling active state Closes #35882 See merge request !13270
This commit is contained in:
commit
57aa5d6314
|
@ -9,6 +9,7 @@ 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/popover';
|
import 'bootstrap-sass/assets/javascripts/bootstrap/popover';
|
||||||
|
import 'bootstrap-sass/assets/javascripts/bootstrap/button';
|
||||||
|
|
||||||
// custom jQuery functions
|
// custom jQuery functions
|
||||||
$.fn.extend({
|
$.fn.extend({
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
---
|
||||||
|
title: Fixed sign-in restrictions buttons not toggling active state
|
||||||
|
merge_request:
|
||||||
|
author:
|
|
@ -69,6 +69,14 @@ feature 'Admin updates settings' 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')
|
||||||
|
|
Loading…
Reference in New Issue