summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-05-22 15:23:56 +0200
committerRémy Coutable <remy@rymai.me>2018-05-24 19:29:30 +0200
commitee9e4d465219010ec8d5f954dcee9496e30a0d76 (patch)
treebe38dba70ca5318929c37ebba33606d435751c23
parent53e30e15281f4633a06b73d23ca1a093bb12597c (diff)
downloadgitlab-ce-ee9e4d465219010ec8d5f954dcee9496e30a0d76.tar.gz
Reduce CE/EE diff in spec/controllers/projects/imports_controller_spec.rb
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--spec/controllers/projects/imports_controller_spec.rb18
1 files changed, 6 insertions, 12 deletions
diff --git a/spec/controllers/projects/imports_controller_spec.rb b/spec/controllers/projects/imports_controller_spec.rb
index 7fb4c1b7425..011843baffc 100644
--- a/spec/controllers/projects/imports_controller_spec.rb
+++ b/spec/controllers/projects/imports_controller_spec.rb
@@ -2,16 +2,15 @@ require 'spec_helper'
describe Projects::ImportsController do
let(:user) { create(:user) }
+ let(:project) { create(:project) }
+
+ before do
+ sign_in(user)
+ project.add_master(user)
+ end
describe 'GET #show' do
context 'when repository does not exists' do
- let(:project) { create(:project) }
-
- before do
- sign_in(user)
- project.add_master(user)
- end
-
it 'renders template' do
get :show, namespace_id: project.namespace.to_param, project_id: project
@@ -28,11 +27,6 @@ describe Projects::ImportsController do
context 'when repository exists' do
let(:project) { create(:project_empty_repo, import_url: 'https://github.com/vim/vim.git') }
- before do
- sign_in(user)
- project.add_master(user)
- end
-
context 'when import is in progress' do
before do
project.update_attribute(:import_status, :started)