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
Jérome Perrin
gitlab-ce
Commits
15914001
Commit
15914001
authored
Apr 12, 2017
by
Luke "Jared" Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Separate examples for each other
parent
7e525015
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
66 additions
and
64 deletions
+66
-64
spec/features/discussion_comments/commit_spec.rb
spec/features/discussion_comments/commit_spec.rb
+18
-0
spec/features/discussion_comments/issue_spec.rb
spec/features/discussion_comments/issue_spec.rb
+16
-0
spec/features/discussion_comments/merge_request_spec.rb
spec/features/discussion_comments/merge_request_spec.rb
+16
-0
spec/features/discussion_comments/snippets_spec.rb
spec/features/discussion_comments/snippets_spec.rb
+16
-0
spec/support/features/discussion_comments_shared_example.rb
spec/support/features/discussion_comments_shared_example.rb
+0
-64
No files found.
spec/features/discussion_comments/commit_spec.rb
0 → 100644
View file @
15914001
require
'spec_helper'
describe
'Discussion Comments Merge Request'
,
:feature
,
:js
do
include
RepoHelpers
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
)
}
before
do
project
.
add_master
(
user
)
login_as
(
user
)
visit
namespace_project_commit_path
(
project
.
namespace
,
project
,
sample_commit
.
id
)
end
it_behaves_like
'discussion comments'
,
'commit'
end
spec/features/discussion_comments/issue_spec.rb
0 → 100644
View file @
15914001
require
'spec_helper'
describe
'Discussion Comments Issue'
,
:feature
,
:js
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:empty_project
)
}
let
(
:issue
)
{
create
(
:issue
,
project:
project
)
}
before
do
project
.
add_master
(
user
)
login_as
(
user
)
visit
namespace_project_issue_path
(
project
.
namespace
,
project
,
issue
)
end
it_behaves_like
'discussion comments'
,
'issue'
end
spec/features/discussion_comments/merge_request_spec.rb
0 → 100644
View file @
15914001
require
'spec_helper'
describe
'Discussion Comments Merge Request'
,
:feature
,
:js
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
)
}
before
do
project
.
add_master
(
user
)
login_as
(
user
)
visit
namespace_project_merge_request_path
(
project
.
namespace
,
project
,
merge_request
)
end
it_behaves_like
'discussion comments'
,
'merge request'
end
spec/features/discussion_comments/snippets_spec.rb
0 → 100644
View file @
15914001
require
'spec_helper'
describe
'Discussion Comments Issue'
,
:feature
,
:js
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:empty_project
)
}
let
(
:snippet
)
{
create
(
:project_snippet
,
:private
,
project:
project
,
author:
user
)
}
before
do
project
.
add_master
(
user
)
login_as
(
user
)
visit
namespace_project_snippet_path
(
project
.
namespace
,
project
,
snippet
)
end
it_behaves_like
'discussion comments'
,
'snippet'
end
spec/
features/discussion_comments_spec
.rb
→
spec/
support/features/discussion_comments_shared_example
.rb
View file @
15914001
require
'spec_helper'
shared_examples
'discussion comments'
do
|
resource_name
|
shared_examples
'discussion comments'
do
|
resource_name
|
let
(
:form_selector
)
{
'.js-main-target-form'
}
let
(
:form_selector
)
{
'.js-main-target-form'
}
let
(
:dropdown_selector
)
{
"
#{
form_selector
}
.comment-type-dropdown"
}
let
(
:dropdown_selector
)
{
"
#{
form_selector
}
.comment-type-dropdown"
}
...
@@ -213,65 +211,3 @@ shared_examples 'discussion comments' do |resource_name|
...
@@ -213,65 +211,3 @@ shared_examples 'discussion comments' do |resource_name|
end
end
end
end
end
end
describe
'Discussion Comments'
,
:feature
,
:js
do
include
RepoHelpers
let
(
:user
)
{
create
(
:user
)
}
describe
'on a merge request'
do
let
(
:project
)
{
create
(
:project
)
}
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
)
}
before
do
login
visit
namespace_project_merge_request_path
(
project
.
namespace
,
project
,
merge_request
)
end
it_behaves_like
'discussion comments'
,
'merge request'
end
describe
'on an issue'
do
let
(
:project
)
{
create
(
:empty_project
)
}
let
(
:issue
)
{
create
(
:issue
,
project:
project
)
}
before
do
login
visit
namespace_project_issue_path
(
project
.
namespace
,
project
,
issue
)
end
it_behaves_like
'discussion comments'
,
'issue'
end
describe
'on an snippet'
do
let
(
:project
)
{
create
(
:empty_project
)
}
let
(
:snippet
)
{
create
(
:project_snippet
,
:private
,
project:
project
,
author:
user
)
}
before
do
login
visit
namespace_project_snippet_path
(
project
.
namespace
,
project
,
snippet
)
end
it_behaves_like
'discussion comments'
,
'snippet'
end
describe
'on a commit'
do
let
(
:project
)
{
create
(
:project
)
}
before
do
login
visit
namespace_project_commit_path
(
project
.
namespace
,
project
,
sample_commit
.
id
)
end
it_behaves_like
'discussion comments'
,
'commit'
end
def
login
project
.
add_master
(
user
)
login_as
(
user
)
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