diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-07-07 17:09:58 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-07-07 17:09:58 +0000 |
| commit | c5e11d0405ce6f1b28af50e918af24cd330cfd65 (patch) | |
| tree | 6877a25a479048f85fd27db4192471a4ff9993e1 | |
| parent | 9c14954a81778a603a38024ce1f3f4953457d13f (diff) | |
| parent | d53690b6e5be2dd5372b10e3bdec4d7ae8c30242 (diff) | |
| download | gitlab-ce-c5e11d0405ce6f1b28af50e918af24cd330cfd65.tar.gz | |
Merge branch '34737-authentiq-oauth-feature-spec' into 'master'
Test logging in via the Authentiq OAuth provider in a feature spec
Closes #34737
See merge request !12694
| -rw-r--r-- | .gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | config/gitlab.yml.example | 5 | ||||
| -rw-r--r-- | spec/features/oauth_login_spec.rb | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a3ce1de50c2..8466edb1981 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -362,6 +362,7 @@ db:migrate:reset-mysql: - git fetch origin v8.14.10 - git checkout -f FETCH_HEAD - 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 - git checkout $CI_COMMIT_SHA - bundle install $BUNDLE_INSTALL_FLAGS diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 75d03de18a1..221e3d6e03b 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -657,7 +657,10 @@ test: client_id: 'YOUR_AUTH0_CLIENT_ID', client_secret: 'YOUR_AUTH0_CLIENT_SECRET', 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: enabled: false servers: diff --git a/spec/features/oauth_login_spec.rb b/spec/features/oauth_login_spec.rb index 1b6d1f3415f..42764e808e6 100644 --- a/spec/features/oauth_login_spec.rb +++ b/spec/features/oauth_login_spec.rb @@ -13,7 +13,7 @@ feature 'OAuth Login', js: true do end providers = [:github, :twitter, :bitbucket, :gitlab, :google_oauth2, - :facebook, :cas3, :auth0] + :facebook, :cas3, :auth0, :authentiq] before(:all) do # The OmniAuth `full_host` parameter doesn't get set correctly (it gets set to something like `http://localhost` |