diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2019-06-05 19:50:30 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2019-06-05 19:50:30 +0000 |
| commit | bb4919103116aa6aa7cf851fc29a8841ffd78026 (patch) | |
| tree | 9b67c5e5ffe01e6288518537629090c91a823a6c /spec | |
| parent | 93d4353be91bc81a11e17cdf7e5dc3d347221542 (diff) | |
| parent | 13a8722464565b272bc00acd608761a3a83dcce0 (diff) | |
| download | gitlab-ce-bb4919103116aa6aa7cf851fc29a8841ffd78026.tar.gz | |
Merge branch 'master' into 'master'
Setup Git client for Jupyter
See merge request gitlab-org/gitlab-ce!28783
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/models/clusters/applications/jupyter_spec.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/models/clusters/applications/jupyter_spec.rb b/spec/models/clusters/applications/jupyter_spec.rb index fc9ebed863e..43fa1010b2b 100644 --- a/spec/models/clusters/applications/jupyter_spec.rb +++ b/spec/models/clusters/applications/jupyter_spec.rb @@ -96,6 +96,8 @@ describe Clusters::Applications::Jupyter do expect(values).to match(/clientId: '?#{application.oauth_application.uid}/) expect(values).to match(/callbackUrl: '?#{application.callback_url}/) expect(values).to include("gitlabProjectIdWhitelist:\n - #{application.cluster.project.id}") + expect(values).to include("c.GitLabOAuthenticator.scope = ['api read_repository write_repository']") + expect(values).to match(/GITLAB_HOST: '?#{Gitlab.config.gitlab.host}/) end context 'when cluster belongs to a project' do |