summaryrefslogtreecommitdiff
path: root/spec/controllers/import
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-12-16 17:43:34 +0100
committerRémy Coutable <remy@rymai.me>2016-12-19 17:35:51 +0100
commite046e4c14d06a19cc30a679f4943c77b56ee6d0c (patch)
tree48885d21b2146a32cbe0f4e592fd9fd6e3d56b9e /spec/controllers/import
parent20aff5cd2b782fa47fe6c15aad07a547179ee147 (diff)
downloadgitlab-ce-e046e4c14d06a19cc30a679f4943c77b56ee6d0c.tar.gz
Namespace access token session key in `Import::GithubController`
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'spec/controllers/import')
-rw-r--r--spec/controllers/import/gitea_controller_spec.rb2
-rw-r--r--spec/controllers/import/github_controller_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/controllers/import/gitea_controller_spec.rb b/spec/controllers/import/gitea_controller_spec.rb
index 3643386ffbc..5ba64ab3eed 100644
--- a/spec/controllers/import/gitea_controller_spec.rb
+++ b/spec/controllers/import/gitea_controller_spec.rb
@@ -9,7 +9,7 @@ describe Import::GiteaController do
include_context 'a GitHub-ish import controller'
def assign_host_url
- session[:host_url] = host_url
+ session[:gitea_host_url] = host_url
end
describe "GET new" do
diff --git a/spec/controllers/import/github_controller_spec.rb b/spec/controllers/import/github_controller_spec.rb
index 55820a7cc65..95696e14b6c 100644
--- a/spec/controllers/import/github_controller_spec.rb
+++ b/spec/controllers/import/github_controller_spec.rb
@@ -29,7 +29,7 @@ describe Import::GithubController do
get :callback
- expect(session[:access_token]).to eq(token)
+ expect(session[:github_access_token]).to eq(token)
expect(controller).to redirect_to(status_import_github_url)
end
end