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
6983184c
Commit
6983184c
authored
Aug 01, 2018
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix specs after merging
!gitlab-org/gitlab-ce/19747 to EE
parent
f93acedb
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
5 deletions
+7
-5
ee/app/services/ee/projects/hashed_storage/migrate_attachments_service.rb
...ee/projects/hashed_storage/migrate_attachments_service.rb
+2
-2
ee/spec/services/projects/hashed_storage/migrate_attachments_service_spec.rb
...ojects/hashed_storage/migrate_attachments_service_spec.rb
+1
-1
ee/spec/services/projects/hashed_storage/migrate_repository_service_spec.rb
...rojects/hashed_storage/migrate_repository_service_spec.rb
+1
-1
spec/models/project_spec.rb
spec/models/project_spec.rb
+3
-1
No files found.
ee/app/services/ee/projects/hashed_storage/migrate_attachments_service.rb
View file @
6983184c
...
...
@@ -9,8 +9,8 @@ module EE
super
do
::
Geo
::
HashedStorageAttachmentsEventStore
.
new
(
project
,
old_
disk_path:
old
_path
,
new_
disk_path:
new
_path
old_
attachments_path:
old_disk
_path
,
new_
attachments_path:
new_disk
_path
).
create
end
end
...
...
ee/spec/services/projects/hashed_storage/migrate_attachments_service_spec.rb
View file @
6983184c
...
...
@@ -2,11 +2,11 @@ require 'spec_helper'
describe
Projects
::
HashedStorage
::
MigrateAttachmentsService
do
let
(
:project
)
{
create
(
:project
,
storage_version:
1
)
}
let
(
:service
)
{
described_class
.
new
(
project
)
}
let
(
:legacy_storage
)
{
Storage
::
LegacyProject
.
new
(
project
)
}
let
(
:hashed_storage
)
{
Storage
::
HashedProject
.
new
(
project
)
}
let
(
:old_attachments_path
)
{
legacy_storage
.
disk_path
}
let
(
:new_attachments_path
)
{
hashed_storage
.
disk_path
}
let
(
:service
)
{
described_class
.
new
(
project
,
old_attachments_path
)
}
describe
'#execute'
do
set
(
:primary
)
{
create
(
:geo_node
,
:primary
)
}
...
...
ee/spec/services/projects/hashed_storage/migrate_repository_service_spec.rb
View file @
6983184c
...
...
@@ -2,9 +2,9 @@ require 'spec_helper'
describe
Projects
::
HashedStorage
::
MigrateRepositoryService
do
let
(
:project
)
{
create
(
:project
,
:empty_repo
,
:wiki_repo
,
:legacy_storage
)
}
let
(
:service
)
{
described_class
.
new
(
project
)
}
let
(
:legacy_storage
)
{
Storage
::
LegacyProject
.
new
(
project
)
}
let
(
:hashed_storage
)
{
Storage
::
HashedProject
.
new
(
project
)
}
let
(
:service
)
{
described_class
.
new
(
project
,
legacy_storage
.
disk_path
)
}
describe
'#execute'
do
set
(
:primary
)
{
create
(
:geo_node
,
:primary
)
}
...
...
spec/models/project_spec.rb
View file @
6983184c
...
...
@@ -3515,7 +3515,9 @@ describe Project do
let
(
:project
)
{
create
(
:project
,
:repository
,
storage_version:
1
,
skip_disk_validation:
true
)
}
it
'moves pages folder to hashed storage'
do
expect_any_instance_of
(
Projects
::
HashedStorage
::
MigrateAttachmentsService
).
to
receive
(
:execute
)
expect_next_instance_of
(
Projects
::
HashedStorage
::
MigrateAttachmentsService
)
do
|
service
|
expect
(
service
).
to
receive
(
:execute
)
end
project
.
rename_repo
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