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
Jérome Perrin
gitlab-ce
Commits
efcac2be
Commit
efcac2be
authored
Sep 29, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7873 from cirosantilli/testme-to-gitlabtest
Replace testme with gitlab-test.
parents
9654cbb5
b49dd2c5
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
6 deletions
+15
-6
db/fixtures/development/04_project.rb
db/fixtures/development/04_project.rb
+1
-1
spec/support/test_env.rb
spec/support/test_env.rb
+14
-5
No files found.
db/fixtures/development/04_project.rb
View file @
efcac2be
...
@@ -7,7 +7,7 @@ Sidekiq::Testing.inline! do
...
@@ -7,7 +7,7 @@ Sidekiq::Testing.inline! do
'https://gitlab.com/gitlab-org/gitlab-ce.git'
,
'https://gitlab.com/gitlab-org/gitlab-ce.git'
,
'https://gitlab.com/gitlab-org/gitlab-ci.git'
,
'https://gitlab.com/gitlab-org/gitlab-ci.git'
,
'https://gitlab.com/gitlab-org/gitlab-shell.git'
,
'https://gitlab.com/gitlab-org/gitlab-shell.git'
,
'https://gitlab.com/gitlab-org/
testme
.git'
,
'https://gitlab.com/gitlab-org/
gitlab-test
.git'
,
'https://github.com/twitter/flight.git'
,
'https://github.com/twitter/flight.git'
,
'https://github.com/twitter/typeahead.js.git'
,
'https://github.com/twitter/typeahead.js.git'
,
'https://github.com/h5bp/html5-boilerplate.git'
,
'https://github.com/h5bp/html5-boilerplate.git'
,
...
...
spec/support/test_env.rb
View file @
efcac2be
...
@@ -46,17 +46,16 @@ module TestEnv
...
@@ -46,17 +46,16 @@ module TestEnv
end
end
def
setup_factory_repo
def
setup_factory_repo
repo_path
=
repos_path
+
"/root/testme.git"
clone_url
=
"https://gitlab.com/gitlab-org/
#{
factory_repo_name
}
.git"
clone_url
=
'https://gitlab.com/gitlab-org/gitlab-test.git'
unless
File
.
directory?
(
repo_path
)
unless
File
.
directory?
(
factory_
repo_path
)
git_cmd
=
%W(git clone --bare
#{
clone_url
}
#{
repo_path
}
)
git_cmd
=
%W(git clone --bare
#{
clone_url
}
#{
factory_
repo_path
}
)
system
(
*
git_cmd
)
system
(
*
git_cmd
)
end
end
end
end
def
copy_repo
(
project
)
def
copy_repo
(
project
)
base_repo_path
=
File
.
expand_path
(
repos_path
+
"/root/testme.git"
)
base_repo_path
=
File
.
expand_path
(
factory_repo_path
)
target_repo_path
=
File
.
expand_path
(
repos_path
+
"/
#{
project
.
namespace
.
path
}
/
#{
project
.
path
}
.git"
)
target_repo_path
=
File
.
expand_path
(
repos_path
+
"/
#{
project
.
namespace
.
path
}
/
#{
project
.
path
}
.git"
)
FileUtils
.
mkdir_p
(
target_repo_path
)
FileUtils
.
mkdir_p
(
target_repo_path
)
FileUtils
.
cp_r
(
"
#{
base_repo_path
}
/."
,
target_repo_path
)
FileUtils
.
cp_r
(
"
#{
base_repo_path
}
/."
,
target_repo_path
)
...
@@ -66,4 +65,14 @@ module TestEnv
...
@@ -66,4 +65,14 @@ module TestEnv
def
repos_path
def
repos_path
Gitlab
.
config
.
gitlab_shell
.
repos_path
Gitlab
.
config
.
gitlab_shell
.
repos_path
end
end
private
def
factory_repo_path
@factory_repo_path
||=
repos_path
+
"/root/
#{
factory_repo_name
}
.git"
end
def
factory_repo_name
'gitlab-test'
end
end
end
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