diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-06-21 09:43:58 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-06-21 09:43:58 -0700 |
| commit | 0f943c941bf0c7abc0358598f4a323b031bcca80 (patch) | |
| tree | 7dd8ea3484252d469368498846c2c2b7f7500af4 /spec/controllers/import/github_controller_spec.rb | |
| parent | 74fbc694de9a9cfe8a048c3c8d937f8e7068ce21 (diff) | |
| parent | 043f8c260f49bb14f1c40ec563179c12c3df7828 (diff) | |
| download | gitlab-ce-0f943c941bf0c7abc0358598f4a323b031bcca80.tar.gz | |
Merge branch 'master' into sh-headless-chrome-support
Diffstat (limited to 'spec/controllers/import/github_controller_spec.rb')
| -rw-r--r-- | spec/controllers/import/github_controller_spec.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/controllers/import/github_controller_spec.rb b/spec/controllers/import/github_controller_spec.rb index 95696e14b6c..45c3fa075ef 100644 --- a/spec/controllers/import/github_controller_spec.rb +++ b/spec/controllers/import/github_controller_spec.rb @@ -21,10 +21,10 @@ describe Import::GithubController do describe "GET callback" do it "updates access token" do token = "asdasd12345" - allow_any_instance_of(Gitlab::GithubImport::Client). - to receive(:get_token).and_return(token) - allow_any_instance_of(Gitlab::GithubImport::Client). - to receive(:github_options).and_return({}) + allow_any_instance_of(Gitlab::GithubImport::Client) + .to receive(:get_token).and_return(token) + allow_any_instance_of(Gitlab::GithubImport::Client) + .to receive(:github_options).and_return({}) stub_omniauth_provider('github') get :callback |