BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
c9ac28fa
Commit
c9ac28fa
authored
Aug 13, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix broken task list spec
parent
8345f2e6
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
11 deletions
+9
-11
issue_note_form.vue
app/assets/javascripts/notes/components/issue_note_form.vue
+1
-0
participants_autocomplete_spec.rb
spec/features/participants_autocomplete_spec.rb
+1
-5
task_lists_spec.rb
spec/features/task_lists_spec.rb
+7
-6
No files found.
app/assets/javascripts/notes/components/issue_note_form.vue
View file @
c9ac28fa
...
@@ -129,6 +129,7 @@
...
@@ -129,6 +129,7 @@
:quick-actions-docs=
"quickActionsDocsUrl"
:quick-actions-docs=
"quickActionsDocsUrl"
:add-spacing-classes=
"false"
>
:add-spacing-classes=
"false"
>
<textarea
<textarea
id=
"note_note"
name=
"note[note]"
name=
"note[note]"
class=
"note-textarea js-gfm-input js-autosize markdown-area js-vue-issue-note-form"
class=
"note-textarea js-gfm-input js-autosize markdown-area js-vue-issue-note-form"
:data-supports-quick-actions=
"!isEditing"
:data-supports-quick-actions=
"!isEditing"
...
...
spec/features/participants_autocomplete_spec.rb
View file @
c9ac28fa
...
@@ -14,11 +14,7 @@ feature 'Member autocomplete', :js do
...
@@ -14,11 +14,7 @@ feature 'Member autocomplete', :js do
shared_examples
"open suggestions when typing @"
do
shared_examples
"open suggestions when typing @"
do
before
do
before
do
page
.
within
(
'.new-note'
)
do
page
.
within
(
'.new-note'
)
do
if
note
.
noteable_type
===
'Issue'
find
(
'#note_note'
).
send_keys
(
'@'
)
find
(
'.js-vue-comment-form'
).
send_keys
(
'@'
)
else
find
(
'#note_note'
).
send_keys
(
'@'
)
end
end
end
end
end
...
...
spec/features/task_lists_spec.rb
View file @
c9ac28fa
require
'spec_helper'
require
'spec_helper'
feature
'Task Lists'
,
js:
true
do
feature
'Task Lists'
do
include
Warden
::
Test
::
Helpers
include
Warden
::
Test
::
Helpers
let
(
:project
)
{
create
(
:project
)
}
let
(
:project
)
{
create
(
:project
)
}
...
@@ -181,7 +181,7 @@ feature 'Task Lists', js: true do
...
@@ -181,7 +181,7 @@ feature 'Task Lists', js: true do
project:
project
,
author:
user
)
project:
project
,
author:
user
)
end
end
it
'renders for note body'
do
it
'renders for note body'
,
:js
do
visit_issue
(
project
,
issue
)
visit_issue
(
project
,
issue
)
expect
(
page
).
to
have_selector
(
'.note ul.task-list'
,
count:
1
)
expect
(
page
).
to
have_selector
(
'.note ul.task-list'
,
count:
1
)
...
@@ -189,14 +189,14 @@ feature 'Task Lists', js: true do
...
@@ -189,14 +189,14 @@ feature 'Task Lists', js: true do
expect
(
page
).
to
have_selector
(
'.note ul input[checked]'
,
count:
2
)
expect
(
page
).
to
have_selector
(
'.note ul input[checked]'
,
count:
2
)
end
end
it
'contains the required selectors'
do
it
'contains the required selectors'
,
:js
do
visit_issue
(
project
,
issue
)
visit_issue
(
project
,
issue
)
expect
(
page
).
to
have_selector
(
'.note .js-task-list-container'
)
expect
(
page
).
to
have_selector
(
'.note .js-task-list-container'
)
expect
(
page
).
to
have_selector
(
'.note .js-task-list-container .task-list .task-list-item .task-list-item-checkbox'
)
expect
(
page
).
to
have_selector
(
'.note .js-task-list-container .task-list .task-list-item .task-list-item-checkbox'
)
end
end
it
'is only editable by author'
do
it
'is only editable by author'
,
:js
do
visit_issue
(
project
,
issue
)
visit_issue
(
project
,
issue
)
expect
(
page
).
to
have_selector
(
'.js-task-list-container'
)
expect
(
page
).
to
have_selector
(
'.js-task-list-container'
)
...
@@ -214,7 +214,7 @@ feature 'Task Lists', js: true do
...
@@ -214,7 +214,7 @@ feature 'Task Lists', js: true do
project:
project
,
author:
user
)
project:
project
,
author:
user
)
end
end
it
'renders for note body'
do
it
'renders for note body'
,
:js
do
visit_issue
(
project
,
issue
)
visit_issue
(
project
,
issue
)
expect
(
page
).
to
have_selector
(
'.note ul.task-list'
,
count:
1
)
expect
(
page
).
to
have_selector
(
'.note ul.task-list'
,
count:
1
)
...
@@ -229,7 +229,7 @@ feature 'Task Lists', js: true do
...
@@ -229,7 +229,7 @@ feature 'Task Lists', js: true do
project:
project
,
author:
user
)
project:
project
,
author:
user
)
end
end
it
'renders for note body'
do
it
'renders for note body'
,
:js
do
visit_issue
(
project
,
issue
)
visit_issue
(
project
,
issue
)
expect
(
page
).
to
have_selector
(
'.note ul.task-list'
,
count:
1
)
expect
(
page
).
to
have_selector
(
'.note ul.task-list'
,
count:
1
)
...
@@ -263,6 +263,7 @@ feature 'Task Lists', js: true do
...
@@ -263,6 +263,7 @@ feature 'Task Lists', js: true do
expect
(
page
).
to
have_selector
(
container
)
expect
(
page
).
to
have_selector
(
container
)
expect
(
page
).
to
have_selector
(
"
#{
container
}
.wiki .task-list .task-list-item .task-list-item-checkbox"
)
expect
(
page
).
to
have_selector
(
"
#{
container
}
.wiki .task-list .task-list-item .task-list-item-checkbox"
)
expect
(
page
).
to
have_selector
(
"
#{
container
}
.js-task-list-field"
)
expect
(
page
).
to
have_selector
(
'form.js-issuable-update'
)
expect
(
page
).
to
have_selector
(
'form.js-issuable-update'
)
expect
(
page
).
to
have_selector
(
'a.btn-close'
)
expect
(
page
).
to
have_selector
(
'a.btn-close'
)
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