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
ad5bd4ad
Commit
ad5bd4ad
authored
Jun 26, 2019
by
Michel Engelen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
updated tests to comply with the corresponding EE branch
parent
370d35b3
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
9 deletions
+9
-9
spec/features/discussion_comments/commit_spec.rb
spec/features/discussion_comments/commit_spec.rb
+2
-2
spec/features/discussion_comments/issue_spec.rb
spec/features/discussion_comments/issue_spec.rb
+2
-2
spec/features/discussion_comments/merge_request_spec.rb
spec/features/discussion_comments/merge_request_spec.rb
+2
-2
spec/features/discussion_comments/snippets_spec.rb
spec/features/discussion_comments/snippets_spec.rb
+2
-2
spec/support/features/discussion_comments_shared_example.rb
spec/support/features/discussion_comments_shared_example.rb
+1
-1
No files found.
spec/features/discussion_comments/commit_spec.rb
View file @
ad5bd4ad
require
'spec_helper'
describe
'
Discussion
Comments Commit'
,
:js
do
describe
'
Thread
Comments Commit'
,
:js
do
include
RepoHelpers
let
(
:user
)
{
create
(
:user
)
}
...
...
@@ -16,7 +16,7 @@ describe 'Discussion Comments Commit', :js do
visit
project_commit_path
(
project
,
sample_commit
.
id
)
end
it_behaves_like
'
discussion
comments'
,
'commit'
it_behaves_like
'
thread
comments'
,
'commit'
it
'has class .js-note-emoji'
do
expect
(
page
).
to
have_css
(
'.js-note-emoji'
)
...
...
spec/features/discussion_comments/issue_spec.rb
View file @
ad5bd4ad
require
'spec_helper'
describe
'
Discussion
Comments Issue'
,
:js
do
describe
'
Thread
Comments Issue'
,
:js
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:issue
)
{
create
(
:issue
,
project:
project
)
}
...
...
@@ -12,5 +12,5 @@ describe 'Discussion Comments Issue', :js do
visit
project_issue_path
(
project
,
issue
)
end
it_behaves_like
'
discussion
comments'
,
'issue'
it_behaves_like
'
thread
comments'
,
'issue'
end
spec/features/discussion_comments/merge_request_spec.rb
View file @
ad5bd4ad
require
'spec_helper'
describe
'
Discussion
Comments Merge Request'
,
:js
do
describe
'
Thread
Comments Merge Request'
,
:js
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
)
}
...
...
@@ -12,5 +12,5 @@ describe 'Discussion Comments Merge Request', :js do
visit
project_merge_request_path
(
project
,
merge_request
)
end
it_behaves_like
'
discussion
comments'
,
'merge request'
it_behaves_like
'
thread
comments'
,
'merge request'
end
spec/features/discussion_comments/snippets_spec.rb
View file @
ad5bd4ad
require
'spec_helper'
describe
'
Discussion
Comments Snippet'
,
:js
do
describe
'
Thread
Comments Snippet'
,
:js
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:snippet
)
{
create
(
:project_snippet
,
:private
,
project:
project
,
author:
user
)
}
...
...
@@ -12,5 +12,5 @@ describe 'Discussion Comments Snippet', :js do
visit
project_snippet_path
(
project
,
snippet
)
end
it_behaves_like
'
discussion
comments'
,
'snippet'
it_behaves_like
'
thread
comments'
,
'snippet'
end
spec/support/features/discussion_comments_shared_example.rb
View file @
ad5bd4ad
shared_examples
'
discussion
comments'
do
|
resource_name
|
shared_examples
'
thread
comments'
do
|
resource_name
|
let
(
:form_selector
)
{
'.js-main-target-form'
}
let
(
:dropdown_selector
)
{
"
#{
form_selector
}
.comment-type-dropdown"
}
let
(
:toggle_selector
)
{
"
#{
dropdown_selector
}
.dropdown-toggle"
}
...
...
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