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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
9d575acc
Commit
9d575acc
authored
Dec 19, 2017
by
Douglas Barbosa Alexandre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix TestEnv.copy_repo to use disk_path instead of full_path
parent
603fcb6b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
spec/models/namespace_spec.rb
spec/models/namespace_spec.rb
+1
-1
spec/models/project_spec.rb
spec/models/project_spec.rb
+1
-1
spec/support/test_env.rb
spec/support/test_env.rb
+1
-1
No files found.
spec/models/namespace_spec.rb
View file @
9d575acc
...
...
@@ -203,7 +203,7 @@ describe Namespace do
context
'with subgroups'
do
let
(
:parent
)
{
create
(
:group
,
name:
'parent'
,
path:
'parent'
)
}
let
(
:child
)
{
create
(
:group
,
name:
'child'
,
path:
'child'
,
parent:
parent
)
}
let!
(
:project
)
{
create
(
:project_empty_repo
,
path:
'the-project'
,
namespace:
child
)
}
let!
(
:project
)
{
create
(
:project_empty_repo
,
path:
'the-project'
,
namespace:
child
,
skip_disk_validation:
true
)
}
let
(
:uploads_dir
)
{
File
.
join
(
CarrierWave
.
root
,
FileUploader
.
base_dir
)
}
let
(
:pages_dir
)
{
File
.
join
(
TestEnv
.
pages_path
)
}
...
...
spec/models/project_spec.rb
View file @
9d575acc
...
...
@@ -2676,7 +2676,7 @@ describe Project do
end
context
'hashed storage'
do
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:project
)
{
create
(
:project
,
:repository
,
skip_disk_validation:
true
)
}
let
(
:gitlab_shell
)
{
Gitlab
::
Shell
.
new
}
let
(
:hash
)
{
'6b86b273ff34fce19d6b804eff5a3f5747ada4eaa22f1d49c01e52ddb7875b4b'
}
...
...
spec/support/test_env.rb
View file @
9d575acc
...
...
@@ -215,7 +215,7 @@ module TestEnv
end
def
copy_repo
(
project
,
bare_repo
:,
refs
:)
target_repo_path
=
File
.
expand_path
(
project
.
repository_storage_path
+
"/
#{
project
.
full
_path
}
.git"
)
target_repo_path
=
File
.
expand_path
(
project
.
repository_storage_path
+
"/
#{
project
.
disk
_path
}
.git"
)
FileUtils
.
mkdir_p
(
target_repo_path
)
FileUtils
.
cp_r
(
"
#{
File
.
expand_path
(
bare_repo
)
}
/."
,
target_repo_path
)
FileUtils
.
chmod_R
0755
,
target_repo_path
...
...
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