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
243a6689
Commit
243a6689
authored
Apr 09, 2021
by
Doug Stull
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix tests being skipped
- remove around hook as it was causing tests to be skipped.
parent
d7b72c34
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
23 additions
and
13 deletions
+23
-13
app/services/groups/group_links/create_service.rb
app/services/groups/group_links/create_service.rb
+1
-1
spec/controllers/groups/group_links_controller_spec.rb
spec/controllers/groups/group_links_controller_spec.rb
+5
-4
spec/controllers/groups/group_members_controller_spec.rb
spec/controllers/groups/group_members_controller_spec.rb
+6
-2
spec/controllers/projects/group_links_controller_spec.rb
spec/controllers/projects/group_links_controller_spec.rb
+5
-4
spec/controllers/projects/project_members_controller_spec.rb
spec/controllers/projects/project_members_controller_spec.rb
+6
-2
No files found.
app/services/groups/group_links/create_service.rb
View file @
243a6689
...
...
@@ -2,7 +2,7 @@
module
Groups
module
GroupLinks
class
CreateService
<
BaseService
class
CreateService
<
Groups
::
BaseService
def
execute
(
shared_group
)
unless
group
&&
shared_group
&&
can?
(
current_user
,
:admin_group_member
,
shared_group
)
&&
...
...
spec/controllers/groups/group_links_controller_spec.rb
View file @
243a6689
...
...
@@ -9,16 +9,17 @@ RSpec.describe Groups::GroupLinksController do
let
(
:group_member
)
{
create
(
:user
)
}
let!
(
:project
)
{
create
(
:project
,
group:
shared_group
)
}
around
do
|
example
|
travel_to
DateTime
.
new
(
2019
,
4
,
1
)
{
example
.
run
}
end
before
do
travel_to
DateTime
.
new
(
2019
,
4
,
1
)
sign_in
(
user
)
shared_with_group
.
add_developer
(
group_member
)
end
after
do
travel_back
end
shared_examples
'placeholder is passed as `id` parameter'
do
|
action
|
it
'returns a 404'
do
post
(
...
...
spec/controllers/groups/group_members_controller_spec.rb
View file @
243a6689
...
...
@@ -9,8 +9,12 @@ RSpec.describe Groups::GroupMembersController do
let
(
:group
)
{
create
(
:group
,
:public
)
}
let
(
:membership
)
{
create
(
:group_member
,
group:
group
)
}
around
do
|
example
|
travel_to
DateTime
.
new
(
2019
,
4
,
1
)
{
example
.
run
}
before
do
travel_to
DateTime
.
new
(
2019
,
4
,
1
)
end
after
do
travel_back
end
describe
'GET index'
do
...
...
spec/controllers/projects/group_links_controller_spec.rb
View file @
243a6689
...
...
@@ -8,15 +8,16 @@ RSpec.describe Projects::GroupLinksController do
let_it_be
(
:project
)
{
create
(
:project
,
:private
,
group:
group2
)
}
let_it_be
(
:user
)
{
create
(
:user
)
}
around
do
|
example
|
travel_to
DateTime
.
new
(
2019
,
4
,
1
)
{
example
.
run
}
end
before
do
travel_to
DateTime
.
new
(
2019
,
4
,
1
)
project
.
add_maintainer
(
user
)
sign_in
(
user
)
end
after
do
travel_back
end
describe
'#create'
do
shared_context
'link project to group'
do
before
do
...
...
spec/controllers/projects/project_members_controller_spec.rb
View file @
243a6689
...
...
@@ -7,8 +7,12 @@ RSpec.describe Projects::ProjectMembersController do
let
(
:group
)
{
create
(
:group
,
:public
)
}
let
(
:project
)
{
create
(
:project
,
:public
)
}
around
do
|
example
|
travel_to
DateTime
.
new
(
2019
,
4
,
1
)
{
example
.
run
}
before
do
travel_to
DateTime
.
new
(
2019
,
4
,
1
)
end
after
do
travel_back
end
describe
'GET index'
do
...
...
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