Commit fcb077ac authored by Filipa Lacerda's avatar Filipa Lacerda

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

Port of fix-oauth-checkboxes to EE

See merge request !2588
parents dd178124 b5d9c906
......@@ -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({
......
---
title: Fixed sign-in restrictions buttons not toggling active state
merge_request:
author:
......@@ -92,6 +92,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')
......
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