diff options
| author | Timothy Andrew <mail@timothyandrew.net> | 2017-07-07 03:25:18 +0000 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2017-07-07 04:54:30 +0000 |
| commit | d53690b6e5be2dd5372b10e3bdec4d7ae8c30242 (patch) | |
| tree | badbd7e218154f82325c7e0c4c67b113120ffcfe | |
| parent | 49430c47d4d34072ff43cc1e35213317802055d7 (diff) | |
| download | gitlab-ce-d53690b6e5be2dd5372b10e3bdec4d7ae8c30242.tar.gz | |
Test logging in via the Authentiq OAuth provider in a feature spec.34737-authentiq-oauth-feature-spec
- The `migration:path-pg` build was previously failing when the Authentiq
feature spec was enabled by placing Authentiq configuration in the `test`
section of `gitlab.yml`
- The `migration:path-pg` task checks out an old revision of the
codebase (`v8.14.10`) and runs a `schema:load`. It then checks out the commit
under test, and runs `db:migrate`, to verify that migrations run without
errors.
- The problem here is that `v8.14.10` does not have the Authentiq module
installed, but is run with the `gitlab.yml` for `master`, which would contain
the `Authentiq` configuration in the `test` section.
- The solution was to use the `v8.14.10` `gitlab.yml` for the `schema:load`,
rather than the `gitlab.yml` from master.
| -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 1eb209ac2be..dfc0424e2f5 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -661,7 +661,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` |