Skip to content
Snippets Groups Projects
Commit 57aa5d63 authored by Filipa Lacerda's avatar Filipa Lacerda
Browse files

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

Fixed sign-in restrictions buttons not toggling active state

Closes #35882

See merge request !13270
parents 8f9b658e 42feb55f
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -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({
Loading
Loading
---
title: Fixed sign-in restrictions buttons not toggling active state
merge_request:
author:
Loading
Loading
@@ -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')
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment