Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kazuhiko Shiozaki
gitlab-ce
Commits
82536f50
Commit
82536f50
authored
Feb 17, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #8774 from tsigo/rs-testenv
TestEnv improvements
parents
d905a431
71948108
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
14 deletions
+20
-14
spec/support/test_env.rb
spec/support/test_env.rb
+20
-14
No files found.
spec/support/test_env.rb
View file @
82536f50
...
@@ -22,16 +22,7 @@ module TestEnv
...
@@ -22,16 +22,7 @@ module TestEnv
# Disable mailer for spinach tests
# Disable mailer for spinach tests
disable_mailer
if
opts
[
:mailer
]
==
false
disable_mailer
if
opts
[
:mailer
]
==
false
# Clean /tmp/tests
clean_test_path
tmp_test_path
=
Rails
.
root
.
join
(
'tmp'
,
'tests'
)
if
File
.
directory?
(
tmp_test_path
)
Dir
.
entries
(
tmp_test_path
).
each
do
|
entry
|
unless
[
'.'
,
'..'
,
'gitlab-shell'
,
factory_repo_name
].
include?
(
entry
)
FileUtils
.
rm_r
(
File
.
join
(
tmp_test_path
,
entry
))
end
end
end
FileUtils
.
mkdir_p
(
repos_path
)
FileUtils
.
mkdir_p
(
repos_path
)
...
@@ -50,15 +41,30 @@ module TestEnv
...
@@ -50,15 +41,30 @@ module TestEnv
allow_any_instance_of
(
NotificationService
).
to
receive
(
:mailer
).
and_call_original
allow_any_instance_of
(
NotificationService
).
to
receive
(
:mailer
).
and_call_original
end
end
# Clean /tmp/tests
#
# Keeps gitlab-shell and gitlab-test
def
clean_test_path
tmp_test_path
=
Rails
.
root
.
join
(
'tmp'
,
'tests'
,
'**'
)
Dir
[
tmp_test_path
].
each
do
|
entry
|
unless
File
.
basename
(
entry
)
=~
/\Agitlab-(shell|test)\z/
FileUtils
.
rm_rf
(
entry
)
end
end
end
def
setup_gitlab_shell
def
setup_gitlab_shell
unless
File
.
directory?
(
Rails
.
root
.
join
(
*
%w(tmp tests gitlab-shell)
))
`rake gitlab:shell:install`
`rake gitlab:shell:install`
end
end
end
def
setup_factory_repo
def
setup_factory_repo
clone_url
=
"https://gitlab.com/gitlab-org/
#{
factory_repo_name
}
.git"
clone_url
=
"https://gitlab.com/gitlab-org/
#{
factory_repo_name
}
.git"
unless
File
.
directory?
(
factory_repo_path
)
unless
File
.
directory?
(
factory_repo_path
)
system
(
*
%W(git clone
#{
clone_url
}
#{
factory_repo_path
}
)
)
system
(
*
%W(git clone
-q
#{
clone_url
}
#{
factory_repo_path
}
)
)
end
end
Dir
.
chdir
(
factory_repo_path
)
do
Dir
.
chdir
(
factory_repo_path
)
do
...
@@ -79,7 +85,7 @@ module TestEnv
...
@@ -79,7 +85,7 @@ module TestEnv
end
end
# We must copy bare repositories because we will push to them.
# We must copy bare repositories because we will push to them.
system
(
*
%W(git clone --bare
#{
factory_repo_path
}
#{
factory_repo_path_bare
}
)
)
system
(
*
%W(git clone -
q -
-bare
#{
factory_repo_path
}
#{
factory_repo_path_bare
}
)
)
end
end
def
copy_repo
(
project
)
def
copy_repo
(
project
)
...
@@ -101,7 +107,7 @@ module TestEnv
...
@@ -101,7 +107,7 @@ module TestEnv
end
end
def
factory_repo_path_bare
def
factory_repo_path_bare
factory_repo_path
.
to_s
+
'_bare'
"
#{
factory_repo_path
}
_bare"
end
end
def
factory_repo_name
def
factory_repo_name
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment