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
Boxiang Sun
gitlab-ce
Commits
3d227e27
Commit
3d227e27
authored
Apr 12, 2017
by
Luke "Jared" Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use empty_project for resources that are independent of the repo
parent
a62ae94d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
7 deletions
+18
-7
spec/features/discussion_comments_spec.rb
spec/features/discussion_comments_spec.rb
+18
-7
No files found.
spec/features/discussion_comments_spec.rb
View file @
3d227e27
...
@@ -247,18 +247,14 @@ describe 'Discussion Comments', :feature, :js do
...
@@ -247,18 +247,14 @@ describe 'Discussion Comments', :feature, :js do
include
RepoHelpers
include
RepoHelpers
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:project
)
}
before
do
project
.
team
<<
[
user
,
:developer
]
login_as
(
user
)
end
describe
'on a merge request'
do
describe
'on a merge request'
do
let
(
:project
)
{
create
(
:project
)
}
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
)
}
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
)
}
before
do
before
do
login
visit
namespace_project_merge_request_path
(
project
.
namespace
,
project
,
merge_request
)
visit
namespace_project_merge_request_path
(
project
.
namespace
,
project
,
merge_request
)
end
end
...
@@ -266,9 +262,12 @@ describe 'Discussion Comments', :feature, :js do
...
@@ -266,9 +262,12 @@ describe 'Discussion Comments', :feature, :js do
end
end
describe
'on an issue'
do
describe
'on an issue'
do
let
(
:project
)
{
create
(
:empty_project
)
}
let
(
:issue
)
{
create
(
:issue
,
project:
project
)
}
let
(
:issue
)
{
create
(
:issue
,
project:
project
)
}
before
do
before
do
login
visit
namespace_project_issue_path
(
project
.
namespace
,
project
,
issue
)
visit
namespace_project_issue_path
(
project
.
namespace
,
project
,
issue
)
end
end
...
@@ -276,9 +275,12 @@ describe 'Discussion Comments', :feature, :js do
...
@@ -276,9 +275,12 @@ describe 'Discussion Comments', :feature, :js do
end
end
describe
'on an snippet'
do
describe
'on an snippet'
do
let
(
:project
)
{
create
(
:empty_project
)
}
let
(
:snippet
)
{
create
(
:project_snippet
,
:private
,
project:
project
,
author:
user
)
}
let
(
:snippet
)
{
create
(
:project_snippet
,
:private
,
project:
project
,
author:
user
)
}
before
do
before
do
login
visit
namespace_project_snippet_path
(
project
.
namespace
,
project
,
snippet
)
visit
namespace_project_snippet_path
(
project
.
namespace
,
project
,
snippet
)
end
end
...
@@ -286,10 +288,19 @@ describe 'Discussion Comments', :feature, :js do
...
@@ -286,10 +288,19 @@ describe 'Discussion Comments', :feature, :js do
end
end
describe
'on a commit'
do
describe
'on a commit'
do
let
(
:project
)
{
create
(
:project
)
}
before
do
before
do
login
visit
namespace_project_commit_path
(
project
.
namespace
,
project
,
sample_commit
.
id
)
visit
namespace_project_commit_path
(
project
.
namespace
,
project
,
sample_commit
.
id
)
end
end
it_behaves_like
'discussion comments'
,
'commit'
it_behaves_like
'discussion comments'
,
'commit'
end
end
def
login
project
.
add_master
(
user
)
login_as
(
user
)
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