Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-12-15 19:36:53 +0300
committerRémy Coutable <remy@rymai.me>2016-12-19 19:35:51 +0300
commit99ddd1dcbed35b642d7bd8a52cc6e5e5453b9f8b (patch)
tree9dd65c4f4cd9d396f4360331bfce519109bab5c1 /spec/support
parent103114e3d73819f76bed9d8ad1bbdb8964875579 (diff)
Modify GithubImport to support Gitea
The reason is that Gitea plan to be GitHub-compatible so it makes sense to just modify GitHubImport a bit for now, and hopefully we can change it to GitHubishImport once Gitea is 100%-compatible. Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'spec/support')
-rw-r--r--spec/support/controllers/githubish_import_controller_shared_context.rb (renamed from spec/support/githubish_import_controller_shared_context.rb)0
-rw-r--r--spec/support/controllers/githubish_import_controller_shared_examples.rb (renamed from spec/support/githubish_import_controller_shared_examples.rb)2
2 files changed, 1 insertions, 1 deletions
diff --git a/spec/support/githubish_import_controller_shared_context.rb b/spec/support/controllers/githubish_import_controller_shared_context.rb
index e71994edec6..e71994edec6 100644
--- a/spec/support/githubish_import_controller_shared_context.rb
+++ b/spec/support/controllers/githubish_import_controller_shared_context.rb
diff --git a/spec/support/githubish_import_controller_shared_examples.rb b/spec/support/controllers/githubish_import_controller_shared_examples.rb
index aa2d8aed0bd..e11ab802095 100644
--- a/spec/support/githubish_import_controller_shared_examples.rb
+++ b/spec/support/controllers/githubish_import_controller_shared_examples.rb
@@ -82,7 +82,7 @@ shared_examples 'a GitHub-ish import controller: GET status' do
expect(session[:access_token]).to eq(nil)
expect(controller).to redirect_to(new_import_url)
- expect(flash[:alert]).to eq("Access denied to your #{Gitlab::ImportSources.options.key(provider.to_s)} account.")
+ expect(flash[:alert]).to eq("Access denied to your #{Gitlab::ImportSources.title(provider.to_s)} account.")
end
end