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
201c329a
Commit
201c329a
authored
Apr 01, 2019
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[EE] Reduce diff with CE in spec/models/namespace_spec.rb
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
c67541ce
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
126 additions
and
124 deletions
+126
-124
ee/spec/models/namespace_spec.rb
ee/spec/models/namespace_spec.rb
+126
-0
spec/models/namespace_spec.rb
spec/models/namespace_spec.rb
+0
-124
No files found.
ee/spec/models/namespace_spec.rb
View file @
201c329a
# frozen_string_literal: true
require
'spec_helper'
require
'spec_helper'
describe
Namespace
do
describe
Namespace
do
...
@@ -686,4 +688,128 @@ describe Namespace do
...
@@ -686,4 +688,128 @@ describe Namespace do
end
end
end
end
end
end
describe
'#actual_size_limit'
do
let
(
:namespace
)
{
build
(
:namespace
)
}
before
do
allow_any_instance_of
(
ApplicationSetting
).
to
receive
(
:repository_size_limit
).
and_return
(
50
)
end
it
'returns the correct size limit'
do
expect
(
namespace
.
actual_size_limit
).
to
eq
(
50
)
end
end
describe
'#membership_lock with subgroups'
,
:nested_groups
do
context
'when creating a subgroup'
do
let
(
:subgroup
)
{
create
(
:group
,
parent:
root_group
)
}
context
'under a parent with "Membership lock" enabled'
do
let
(
:root_group
)
{
create
(
:group
,
membership_lock:
true
)
}
it
'enables "Membership lock" on the subgroup'
do
expect
(
subgroup
.
membership_lock
).
to
be_truthy
end
end
context
'under a parent with "Membership lock" disabled'
do
let
(
:root_group
)
{
create
(
:group
)
}
it
'does not enable "Membership lock" on the subgroup'
do
expect
(
subgroup
.
membership_lock
).
to
be_falsey
end
end
context
'when enabling the parent group "Membership lock"'
do
let
(
:root_group
)
{
create
(
:group
)
}
let!
(
:subgroup
)
{
create
(
:group
,
parent:
root_group
)
}
it
'the subgroup "Membership lock" not changed'
do
root_group
.
update!
(
membership_lock:
true
)
expect
(
subgroup
.
reload
.
membership_lock
).
to
be_falsey
end
end
context
'when disabling the parent group "Membership lock" (which was already enabled)'
do
let
(
:root_group
)
{
create
(
:group
,
membership_lock:
true
)
}
context
'and the subgroup "Membership lock" is enabled'
do
let
(
:subgroup
)
{
create
(
:group
,
parent:
root_group
,
membership_lock:
true
)
}
it
'the subgroup "Membership lock" does not change'
do
root_group
.
update!
(
membership_lock:
false
)
expect
(
subgroup
.
reload
.
membership_lock
).
to
be_truthy
end
end
context
'but the subgroup "Membership lock" is disabled'
do
let
(
:subgroup
)
{
create
(
:group
,
parent:
root_group
)
}
it
'the subgroup "Membership lock" does not change'
do
root_group
.
update!
(
membership_lock:
false
)
expect
(
subgroup
.
reload
.
membership_lock?
).
to
be_falsey
end
end
end
end
# Note: Group transfers are not yet implemented
context
'when a group is transferred into a root group'
do
context
'when the root group "Membership lock" is enabled'
do
let
(
:root_group
)
{
create
(
:group
,
membership_lock:
true
)
}
context
'when the subgroup "Membership lock" is enabled'
do
let
(
:subgroup
)
{
create
(
:group
,
membership_lock:
true
)
}
it
'the subgroup "Membership lock" does not change'
do
subgroup
.
parent
=
root_group
subgroup
.
save!
expect
(
subgroup
.
membership_lock
).
to
be_truthy
end
end
context
'when the subgroup "Membership lock" is disabled'
do
let
(
:subgroup
)
{
create
(
:group
)
}
it
'the subgroup "Membership lock" not changed'
do
subgroup
.
parent
=
root_group
subgroup
.
save!
expect
(
subgroup
.
membership_lock
).
to
be_falsey
end
end
end
context
'when the root group "Membership lock" is disabled'
do
let
(
:root_group
)
{
create
(
:group
)
}
context
'when the subgroup "Membership lock" is enabled'
do
let
(
:subgroup
)
{
create
(
:group
,
membership_lock:
true
)
}
it
'the subgroup "Membership lock" does not change'
do
subgroup
.
parent
=
root_group
subgroup
.
save!
expect
(
subgroup
.
membership_lock
).
to
be_truthy
end
end
context
'when the subgroup "Membership lock" is disabled'
do
let
(
:subgroup
)
{
create
(
:group
)
}
it
'the subgroup "Membership lock" does not change'
do
subgroup
.
parent
=
root_group
subgroup
.
save!
expect
(
subgroup
.
membership_lock
).
to
be_falsey
end
end
end
end
end
end
end
spec/models/namespace_spec.rb
View file @
201c329a
...
@@ -376,18 +376,6 @@ describe Namespace do
...
@@ -376,18 +376,6 @@ describe Namespace do
end
end
end
end
describe
'#actual_size_limit'
do
let
(
:namespace
)
{
build
(
:namespace
)
}
before
do
allow_any_instance_of
(
ApplicationSetting
).
to
receive
(
:repository_size_limit
).
and_return
(
50
)
end
it
'returns the correct size limit'
do
expect
(
namespace
.
actual_size_limit
).
to
eq
(
50
)
end
end
describe
'#rm_dir'
,
'callback'
do
describe
'#rm_dir'
,
'callback'
do
let
(
:repository_storage_path
)
do
let
(
:repository_storage_path
)
do
Gitlab
::
GitalyClient
::
StorageSettings
.
allow_disk_access
do
Gitlab
::
GitalyClient
::
StorageSettings
.
allow_disk_access
do
...
@@ -707,118 +695,6 @@ describe Namespace do
...
@@ -707,118 +695,6 @@ describe Namespace do
end
end
end
end
describe
'#membership_lock with subgroups'
,
:nested_groups
do
context
'when creating a subgroup'
do
let
(
:subgroup
)
{
create
(
:group
,
parent:
root_group
)
}
context
'under a parent with "Membership lock" enabled'
do
let
(
:root_group
)
{
create
(
:group
,
membership_lock:
true
)
}
it
'enables "Membership lock" on the subgroup'
do
expect
(
subgroup
.
membership_lock
).
to
be_truthy
end
end
context
'under a parent with "Membership lock" disabled'
do
let
(
:root_group
)
{
create
(
:group
)
}
it
'does not enable "Membership lock" on the subgroup'
do
expect
(
subgroup
.
membership_lock
).
to
be_falsey
end
end
context
'when enabling the parent group "Membership lock"'
do
let
(
:root_group
)
{
create
(
:group
)
}
let!
(
:subgroup
)
{
create
(
:group
,
parent:
root_group
)
}
it
'the subgroup "Membership lock" not changed'
do
root_group
.
update!
(
membership_lock:
true
)
expect
(
subgroup
.
reload
.
membership_lock
).
to
be_falsey
end
end
context
'when disabling the parent group "Membership lock" (which was already enabled)'
do
let
(
:root_group
)
{
create
(
:group
,
membership_lock:
true
)
}
context
'and the subgroup "Membership lock" is enabled'
do
let
(
:subgroup
)
{
create
(
:group
,
parent:
root_group
,
membership_lock:
true
)
}
it
'the subgroup "Membership lock" does not change'
do
root_group
.
update!
(
membership_lock:
false
)
expect
(
subgroup
.
reload
.
membership_lock
).
to
be_truthy
end
end
context
'but the subgroup "Membership lock" is disabled'
do
let
(
:subgroup
)
{
create
(
:group
,
parent:
root_group
)
}
it
'the subgroup "Membership lock" does not change'
do
root_group
.
update!
(
membership_lock:
false
)
expect
(
subgroup
.
reload
.
membership_lock?
).
to
be_falsey
end
end
end
end
# Note: Group transfers are not yet implemented
context
'when a group is transferred into a root group'
do
context
'when the root group "Membership lock" is enabled'
do
let
(
:root_group
)
{
create
(
:group
,
membership_lock:
true
)
}
context
'when the subgroup "Membership lock" is enabled'
do
let
(
:subgroup
)
{
create
(
:group
,
membership_lock:
true
)
}
it
'the subgroup "Membership lock" does not change'
do
subgroup
.
parent
=
root_group
subgroup
.
save!
expect
(
subgroup
.
membership_lock
).
to
be_truthy
end
end
context
'when the subgroup "Membership lock" is disabled'
do
let
(
:subgroup
)
{
create
(
:group
)
}
it
'the subgroup "Membership lock" not changed'
do
subgroup
.
parent
=
root_group
subgroup
.
save!
expect
(
subgroup
.
membership_lock
).
to
be_falsey
end
end
end
context
'when the root group "Membership lock" is disabled'
do
let
(
:root_group
)
{
create
(
:group
)
}
context
'when the subgroup "Membership lock" is enabled'
do
let
(
:subgroup
)
{
create
(
:group
,
membership_lock:
true
)
}
it
'the subgroup "Membership lock" does not change'
do
subgroup
.
parent
=
root_group
subgroup
.
save!
expect
(
subgroup
.
membership_lock
).
to
be_truthy
end
end
context
'when the subgroup "Membership lock" is disabled'
do
let
(
:subgroup
)
{
create
(
:group
)
}
it
'the subgroup "Membership lock" does not change'
do
subgroup
.
parent
=
root_group
subgroup
.
save!
expect
(
subgroup
.
membership_lock
).
to
be_falsey
end
end
end
end
end
describe
'#find_fork_of?'
do
describe
'#find_fork_of?'
do
let
(
:project
)
{
create
(
:project
,
:public
)
}
let
(
:project
)
{
create
(
:project
,
:public
)
}
let!
(
:forked_project
)
{
fork_project
(
project
,
namespace
.
owner
,
namespace:
namespace
)
}
let!
(
:forked_project
)
{
fork_project
(
project
,
namespace
.
owner
,
namespace:
namespace
)
}
...
...
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