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
f3d63eeb
Commit
f3d63eeb
authored
May 04, 2015
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove feature tests for old task lists
parent
c915c7b0
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
4 additions
and
160 deletions
+4
-160
features/project/issues/issues.feature
features/project/issues/issues.feature
+4
-37
features/project/merge_requests.feature
features/project/merge_requests.feature
+0
-32
features/steps/project/issues/issues.rb
features/steps/project/issues/issues.rb
+0
-8
features/steps/project/merge_requests.rb
features/steps/project/merge_requests.rb
+0
-4
features/steps/shared/markdown.rb
features/steps/shared/markdown.rb
+0
-45
features/steps/shared/note.rb
features/steps/shared/note.rb
+0
-14
features/steps/shared/paths.rb
features/steps/shared/paths.rb
+0
-20
No files found.
features/project/issues/issues.feature
View file @
f3d63eeb
...
@@ -134,48 +134,15 @@ Feature: Project Issues
...
@@ -134,48 +134,15 @@ Feature: Project Issues
And
I should see
"Release 0.4"
in issues
And
I should see
"Release 0.4"
in issues
And
I should not see
"Tweet control"
in issues
And
I should not see
"Tweet control"
in issues
Scenario
:
Issue description should render task checkboxes
Given
project
"Shop"
has
"Tasks-open"
open issue with task markdown
When
I visit issue page
"Tasks-open"
Then
I should see task checkboxes in the description
@javascript
Scenario
:
Issue notes should not render task checkboxes
Given
project
"Shop"
has
"Tasks-open"
open issue with task markdown
When
I visit issue page
"Tasks-open"
And
I leave a comment with task markdown
Then
I should not see task checkboxes in the comment
@javascript
@javascript
Scenario
:
Issue notes should be editable with +1
Scenario
:
Issue notes should be editable with +1
Given
project
"Shop"
ha
s
"Tasks-open"
open issue with task markdown
Given
project
"Shop"
ha
ve
"Release 0.4"
open issue
When
I visit issue page
"
Tasks-open
"
When
I visit issue page
"
Release 0.4
"
And
I leave a comment with a header containing
"Comment with a header"
And
I leave a comment with a header containing
"Comment with a header"
Then
The comment with the header should not have an ID
Then
The comment with the header should not have an ID
And
I edit the last comment with a +1
And
I edit the last comment with a +1
Then
I should see +1 in the description
Then
I should see +1 in the description
# Task status in issues list
Scenario
:
Issues list should display task status
Given
project
"Shop"
has
"Tasks-open"
open issue with task markdown
When
I visit project
"Shop"
issues page
Then
I should see the task status for the Taskable
# Toggling task items
@javascript
Scenario
:
Task checkboxes should be enabled for an open issue
Given
project
"Shop"
has
"Tasks-open"
open issue with task markdown
When
I visit issue page
"Tasks-open"
Then
Task checkboxes should be enabled
@javascript
Scenario
:
Task checkboxes should be disabled for a closed issue
Given
project
"Shop"
has
"Tasks-closed"
closed issue with task markdown
When
I visit issue page
"Tasks-closed"
Then
Task checkboxes should be disabled
# Issue description preview
# Issue description preview
@javascript
@javascript
...
@@ -212,8 +179,8 @@ Feature: Project Issues
...
@@ -212,8 +179,8 @@ Feature: Project Issues
@javascript
@javascript
Scenario
:
I
can unsubscribe from issue
Scenario
:
I
can unsubscribe from issue
Given
project
"Shop"
ha
s
"Tasks-open"
open issue with task markdown
Given
project
"Shop"
ha
ve
"Release 0.4"
open issue
When
I visit issue page
"
Tasks-open
"
When
I visit issue page
"
Release 0.4
"
Then
I should see that I am subscribed
Then
I should see that I am subscribed
When
I click button
"Unsubscribe"
When
I click button
"Unsubscribe"
Then
I should see that I am unsubscribed
Then
I should see that I am unsubscribed
features/project/merge_requests.feature
View file @
f3d63eeb
...
@@ -96,16 +96,6 @@ Feature: Project Merge Requests
...
@@ -96,16 +96,6 @@ Feature: Project Merge Requests
And
I leave a comment with a header containing
"Comment with a header"
And
I leave a comment with a header containing
"Comment with a header"
Then
The comment with the header should not have an ID
Then
The comment with the header should not have an ID
Scenario
:
Merge request description should render task checkboxes
Given
project
"Shop"
has
"MR-task-open"
open MR with task markdown
When
I visit merge request page
"MR-task-open"
Then
I should see task checkboxes in the description
Scenario
:
Merge request notes should not render task checkboxes
Given
project
"Shop"
has
"MR-task-open"
open MR with task markdown
When
I visit merge request page
"MR-task-open"
Then
I should not see task checkboxes in the comment
# Toggling inline comments
# Toggling inline comments
@javascript
@javascript
...
@@ -173,28 +163,6 @@ Feature: Project Merge Requests
...
@@ -173,28 +163,6 @@ Feature: Project Merge Requests
And
I click on the Changes tab via Javascript
And
I click on the Changes tab via Javascript
Then
I should see the proper Inline and Side-by-side links
Then
I should see the proper Inline and Side-by-side links
# Task status in issues list
Scenario
:
Merge requests list should display task status
Given
project
"Shop"
has
"MR-task-open"
open MR with task markdown
When
I visit project
"Shop"
merge requests page
Then
I should see the task status for the Taskable
# Toggling task items
@javascript
Scenario
:
Task checkboxes should be enabled for an open merge request
Given
project
"Shop"
has
"MR-task-open"
open MR with task markdown
When
I visit merge request page
"MR-task-open"
Then
Task checkboxes should be enabled
@javascript
Scenario
:
Task checkboxes should be disabled for a closed merge request
Given
project
"Shop"
has
"MR-task-open"
open MR with task markdown
And
I visit merge request page
"MR-task-open"
And
I click link
"Close"
Then
Task checkboxes should be disabled
# Description preview
# Description preview
@javascript
@javascript
...
...
features/steps/project/issues/issues.rb
View file @
f3d63eeb
...
@@ -179,14 +179,6 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
...
@@ -179,14 +179,6 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
author:
project
.
users
.
first
)
author:
project
.
users
.
first
)
end
end
step
'project "Shop" has "Tasks-open" open issue with task markdown'
do
create_taskable
(
:issue
,
'Tasks-open'
)
end
step
'project "Shop" has "Tasks-closed" closed issue with task markdown'
do
create_taskable
(
:closed_issue
,
'Tasks-closed'
)
end
step
'empty project "Empty Project"'
do
step
'empty project "Empty Project"'
do
create
:empty_project
,
name:
'Empty Project'
,
namespace:
@user
.
namespace
create
:empty_project
,
name:
'Empty Project'
,
namespace:
@user
.
namespace
end
end
...
...
features/steps/project/merge_requests.rb
View file @
f3d63eeb
...
@@ -108,10 +108,6 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
...
@@ -108,10 +108,6 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
author:
project
.
users
.
first
)
author:
project
.
users
.
first
)
end
end
step
'project "Shop" has "MR-task-open" open MR with task markdown'
do
create_taskable
(
:merge_request
,
'MR-task-open'
)
end
step
'I switch to the diff tab'
do
step
'I switch to the diff tab'
do
visit
diffs_namespace_project_merge_request_path
(
project
.
namespace
,
project
,
merge_request
)
visit
diffs_namespace_project_merge_request_path
(
project
.
namespace
,
project
,
merge_request
)
end
end
...
...
features/steps/shared/markdown.rb
View file @
f3d63eeb
...
@@ -10,55 +10,10 @@ module SharedMarkdown
...
@@ -10,55 +10,10 @@ module SharedMarkdown
find
(
:xpath
,
"
#{
node
.
path
}
/.."
).
text
.
should
==
text
find
(
:xpath
,
"
#{
node
.
path
}
/.."
).
text
.
should
==
text
end
end
def
create_taskable
(
type
,
title
)
desc_text
=
<<
EOT
.
gsub
(
/^ {6}/
,
''
)
* [ ] Task 1
* [x] Task 2
EOT
case
type
when
:issue
,
:closed_issue
options
=
{
project:
project
}
when
:merge_request
options
=
{
source_project:
project
,
target_project:
project
}
end
create
(
type
,
options
.
merge
(
title:
title
,
author:
project
.
users
.
first
,
description:
desc_text
)
)
end
step
'Header "Description header" should have correct id and link'
do
step
'Header "Description header" should have correct id and link'
do
header_should_have_correct_id_and_link
(
1
,
'Description header'
,
'description-header'
)
header_should_have_correct_id_and_link
(
1
,
'Description header'
,
'description-header'
)
end
end
step
'I should see task checkboxes in the description'
do
expect
(
page
).
to
have_selector
(
'div.description li.task-list-item input[type="checkbox"]'
)
end
step
'I should see the task status for the Taskable'
do
expect
(
find
(
:css
,
'span.task-status'
).
text
).
to
eq
(
'2 tasks (1 done, 1 unfinished)'
)
end
step
'Task checkboxes should be enabled'
do
expect
(
page
).
to
have_selector
(
'div.description li.task-list-item input[type="checkbox"]:enabled'
)
end
step
'Task checkboxes should be disabled'
do
expect
(
page
).
to
have_selector
(
'div.description li.task-list-item input[type="checkbox"]:disabled'
)
end
step
'I should not see the Markdown preview'
do
step
'I should not see the Markdown preview'
do
expect
(
find
(
'.gfm-form .js-md-preview'
)).
not_to
be_visible
expect
(
find
(
'.gfm-form .js-md-preview'
)).
not_to
be_visible
end
end
...
...
features/steps/shared/note.rb
View file @
f3d63eeb
...
@@ -122,20 +122,6 @@ module SharedNote
...
@@ -122,20 +122,6 @@ module SharedNote
end
end
end
end
step
'I leave a comment with task markdown'
do
within
(
'.js-main-target-form'
)
do
fill_in
'note[note]'
,
with:
'* [x] Task item'
click_button
'Add Comment'
sleep
0.05
end
end
step
'I should not see task checkboxes in the comment'
do
expect
(
page
).
not_to
have_selector
(
'li.note div.timeline-content input[type="checkbox"]'
)
end
step
'I edit the last comment with a +1'
do
step
'I edit the last comment with a +1'
do
find
(
".note"
).
hover
find
(
".note"
).
hover
find
(
'.js-note-edit'
).
click
find
(
'.js-note-edit'
).
click
...
...
features/steps/shared/paths.rb
View file @
f3d63eeb
...
@@ -323,16 +323,6 @@ module SharedPaths
...
@@ -323,16 +323,6 @@ module SharedPaths
visit
namespace_project_issue_path
(
issue
.
project
.
namespace
,
issue
.
project
,
issue
)
visit
namespace_project_issue_path
(
issue
.
project
.
namespace
,
issue
.
project
,
issue
)
end
end
step
'I visit issue page "Tasks-open"'
do
issue
=
Issue
.
find_by
(
title:
'Tasks-open'
)
visit
namespace_project_issue_path
(
issue
.
project
.
namespace
,
issue
.
project
,
issue
)
end
step
'I visit issue page "Tasks-closed"'
do
issue
=
Issue
.
find_by
(
title:
'Tasks-closed'
)
visit
namespace_project_issue_path
(
issue
.
project
.
namespace
,
issue
.
project
,
issue
)
end
step
'I visit project "Shop" labels page'
do
step
'I visit project "Shop" labels page'
do
project
=
Project
.
find_by
(
name:
'Shop'
)
project
=
Project
.
find_by
(
name:
'Shop'
)
visit
namespace_project_labels_path
(
project
.
namespace
,
project
)
visit
namespace_project_labels_path
(
project
.
namespace
,
project
)
...
@@ -363,16 +353,6 @@ module SharedPaths
...
@@ -363,16 +353,6 @@ module SharedPaths
visit
namespace_project_merge_request_path
(
mr
.
target_project
.
namespace
,
mr
.
target_project
,
mr
)
visit
namespace_project_merge_request_path
(
mr
.
target_project
.
namespace
,
mr
.
target_project
,
mr
)
end
end
step
'I visit merge request page "MR-task-open"'
do
mr
=
MergeRequest
.
find_by
(
title:
'MR-task-open'
)
visit
namespace_project_merge_request_path
(
mr
.
target_project
.
namespace
,
mr
.
target_project
,
mr
)
end
step
'I visit merge request page "MR-task-closed"'
do
mr
=
MergeRequest
.
find_by
(
title:
'MR-task-closed'
)
visit
namespace_project_merge_request_path
(
mr
.
target_project
.
namespace
,
mr
.
target_project
,
mr
)
end
step
'I visit project "Shop" merge requests page'
do
step
'I visit project "Shop" merge requests page'
do
visit
namespace_project_merge_requests_path
(
project
.
namespace
,
project
)
visit
namespace_project_merge_requests_path
(
project
.
namespace
,
project
)
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