Commit 9d3b8832 authored by Douwe Maan's avatar Douwe Maan

Merge branch '34737-authentiq-oauth-feature-spec-ee' into 'master'

Fix EE conflicts for "Test logging in via the Authentiq OAuth provider in a feature spec"

See merge request !2368
parents c43d2abc d7b22ce1
...@@ -348,6 +348,7 @@ db:migrate:reset-mysql: ...@@ -348,6 +348,7 @@ db:migrate:reset-mysql:
- git fetch origin v8.14.10-ee - git fetch origin v8.14.10-ee
- git checkout -f FETCH_HEAD - git checkout -f FETCH_HEAD
- bundle install $BUNDLE_INSTALL_FLAGS - bundle install $BUNDLE_INSTALL_FLAGS
- cp config/gitlab.yml.example config/gitlab.yml
- bundle exec rake db:drop db:create db:schema:load db:seed_fu - bundle exec rake db:drop db:create db:schema:load db:seed_fu
- git checkout $CI_COMMIT_SHA - git checkout $CI_COMMIT_SHA
- bundle install $BUNDLE_INSTALL_FLAGS - bundle install $BUNDLE_INSTALL_FLAGS
......
...@@ -762,7 +762,10 @@ test: ...@@ -762,7 +762,10 @@ test:
client_id: 'YOUR_AUTH0_CLIENT_ID', client_id: 'YOUR_AUTH0_CLIENT_ID',
client_secret: 'YOUR_AUTH0_CLIENT_SECRET', client_secret: 'YOUR_AUTH0_CLIENT_SECRET',
namespace: 'YOUR_AUTH0_DOMAIN' } } namespace: 'YOUR_AUTH0_DOMAIN' } }
- { name: 'authentiq',
app_id: 'YOUR_CLIENT_ID',
app_secret: 'YOUR_CLIENT_SECRET',
args: { scope: 'aq:name email~rs address aq:push' } }
ldap: ldap:
enabled: false enabled: false
servers: servers:
......
...@@ -13,7 +13,7 @@ feature 'OAuth Login', js: true do ...@@ -13,7 +13,7 @@ feature 'OAuth Login', js: true do
end end
providers = [:github, :twitter, :bitbucket, :gitlab, :google_oauth2, providers = [:github, :twitter, :bitbucket, :gitlab, :google_oauth2,
:facebook, :cas3, :auth0] :facebook, :cas3, :auth0, :authentiq]
before(:all) do before(:all) do
# The OmniAuth `full_host` parameter doesn't get set correctly (it gets set to something like `http://localhost` # The OmniAuth `full_host` parameter doesn't get set correctly (it gets set to something like `http://localhost`
......
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