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:
Filipa Lacerda 2017-08-03 16:03:23 +00:00
commit 57aa5d6314
3 changed files with 13 additions and 0 deletions

View File

@ -9,6 +9,7 @@ import 'bootstrap-sass/assets/javascripts/bootstrap/tab';
import 'bootstrap-sass/assets/javascripts/bootstrap/transition';
import 'bootstrap-sass/assets/javascripts/bootstrap/tooltip';
import 'bootstrap-sass/assets/javascripts/bootstrap/popover';
import 'bootstrap-sass/assets/javascripts/bootstrap/button';
// custom jQuery functions
$.fn.extend({

View File

@ -0,0 +1,4 @@
---
title: Fixed sign-in restrictions buttons not toggling active state
merge_request:
author:

View File

@ -69,6 +69,14 @@ feature 'Admin updates settings' do
expect(find('#service_push_channel').value).to eq '#test_channel'
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
page.check('Active')
page.check('Push')