summaryrefslogtreecommitdiff
path: root/spec/controllers
diff options
context:
space:
mode:
authorValery Sizov <valery@gitlab.com>2015-02-02 17:01:07 -0800
committerValery Sizov <valery@gitlab.com>2015-02-05 12:50:34 -0800
commit33349dd54928a0b074b4ae3ebfabf214799fc085 (patch)
tree593a14d0f6df812410349f353e252e3a58d8cacd /spec/controllers
parent713bc152bde5396bb95a1555907bcd9a2847839d (diff)
downloadgitlab-ce-33349dd54928a0b074b4ae3ebfabf214799fc085.tar.gz
GitLab.com integration: refactoring
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/import/github_controller_spec.rb (renamed from spec/controllers/importers/githubs_controller_spec.rb)4
-rw-r--r--spec/controllers/import/gitlab_controller_spec.rb (renamed from spec/controllers/importers/gitlabs_controller_spec.rb)4
2 files changed, 4 insertions, 4 deletions
diff --git a/spec/controllers/importers/githubs_controller_spec.rb b/spec/controllers/import/github_controller_spec.rb
index e21b5f8a470..ef93ff6f92f 100644
--- a/spec/controllers/importers/githubs_controller_spec.rb
+++ b/spec/controllers/import/github_controller_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'
-describe Importers::GithubsController do
+describe Import::GithubController do
let(:user) { create(:user, github_access_token: 'asd123') }
before do
@@ -16,7 +16,7 @@ describe Importers::GithubsController do
get :callback
user.reload.github_access_token.should == token
- controller.should redirect_to(status_importers_github_url)
+ controller.should redirect_to(status_import_github_url)
end
end
diff --git a/spec/controllers/importers/gitlabs_controller_spec.rb b/spec/controllers/import/gitlab_controller_spec.rb
index af42d14ded3..36995091c69 100644
--- a/spec/controllers/importers/gitlabs_controller_spec.rb
+++ b/spec/controllers/import/gitlab_controller_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'
-describe Importers::GitlabsController do
+describe Import::GitlabController do
let(:user) { create(:user, gitlab_access_token: 'asd123') }
before do
@@ -16,7 +16,7 @@ describe Importers::GitlabsController do
get :callback
user.reload.gitlab_access_token.should == token
- controller.should redirect_to(status_importers_gitlab_url)
+ controller.should redirect_to(status_import_gitlab_url)
end
end