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
b9fa82da
Unverified
Commit
b9fa82da
authored
Jun 26, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update tests and use js-issuable class for context form
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
a9095280
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
11 additions
and
11 deletions
+11
-11
issue.js.coffee
app/assets/javascripts/issue.js.coffee
+1
-1
merge_request.js.coffee
app/assets/javascripts/merge_request.js.coffee
+1
-1
_issue.html.haml
app/views/projects/issues/_issue.html.haml
+1
-1
_context.html.haml
app/views/shared/issuable/_context.html.haml
+1
-1
issues_spec.rb
spec/features/issues_spec.rb
+2
-2
task_lists_spec.rb
spec/features/task_lists_spec.rb
+3
-3
issues_show.html.haml
spec/javascripts/fixtures/issues_show.html.haml
+1
-1
merge_requests_show.html.haml
spec/javascripts/fixtures/merge_requests_show.html.haml
+1
-1
No files found.
app/assets/javascripts/issue.js.coffee
View file @
b9fa82da
...
...
@@ -25,5 +25,5 @@ class @Issue
$
.
ajax
type
:
'PATCH'
url
:
$
(
'form.js-issue-update'
).
attr
(
'action'
)
url
:
$
(
'form.js-issu
abl
e-update'
).
attr
(
'action'
)
data
:
patchData
app/assets/javascripts/merge_request.js.coffee
View file @
b9fa82da
...
...
@@ -49,5 +49,5 @@ class @MergeRequest
$
.
ajax
type
:
'PATCH'
url
:
$
(
'form.js-
merge-request
-update'
).
attr
(
'action'
)
url
:
$
(
'form.js-
issuable
-update'
).
attr
(
'action'
)
data
:
patchData
app/views/projects/issues/_issue.html.haml
View file @
b9fa82da
%li
{
id:
dom_id
(
issue
),
class:
issue_css_classes
(
issue
),
url:
issue_path
(
issue
)
}
-
if
controller
.
controller_name
==
'issues'
.issue-check
=
check_box_tag
dom_id
(
issue
,
"selected"
),
nil
,
false
,
'data-id'
=>
issue
.
id
,
class:
"selected_issue"
,
disabled:
!
can?
(
current_user
,
:
modify_issu
e
,
issue
)
=
check_box_tag
dom_id
(
issue
,
"selected"
),
nil
,
false
,
'data-id'
=>
issue
.
id
,
class:
"selected_issue"
,
disabled:
!
can?
(
current_user
,
:
set_assigne
e
,
issue
)
.issue-title
%span
.issue-title-text
...
...
app/views/shared/issuable/_context.html.haml
View file @
b9fa82da
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
issuable
],
remote:
true
,
html:
{
class:
'issuable-context-form inline-update js-
merge-request
-update'
}
do
|
f
|
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
issuable
],
remote:
true
,
html:
{
class:
'issuable-context-form inline-update js-
issuable
-update'
}
do
|
f
|
%div
.prepend-top-20
.issuable-context-title
%label
...
...
spec/features/issues_spec.rb
View file @
b9fa82da
...
...
@@ -218,7 +218,7 @@ describe 'Issues', feature: true do
it
'with dropdown menu'
do
visit
namespace_project_issue_path
(
project
.
namespace
,
project
,
issue
)
find
(
'.
edit-issue.inline-update
#issue_assignee_id'
).
find
(
'.
context
#issue_assignee_id'
).
set
project
.
team
.
members
.
first
.
id
click_button
'Update Issue'
...
...
@@ -257,7 +257,7 @@ describe 'Issues', feature: true do
it
'with dropdown menu'
do
visit
namespace_project_issue_path
(
project
.
namespace
,
project
,
issue
)
find
(
'.
edit-issue.inline-update
'
).
find
(
'.
context
'
).
select
(
milestone
.
title
,
from:
'issue_milestone_id'
)
click_button
'Update Issue'
...
...
spec/features/task_lists_spec.rb
View file @
b9fa82da
require
'spec_helper'
feature
'Task Lists'
do
feature
'Task Lists'
,
feature:
true
do
include
Warden
::
Test
::
Helpers
let
(
:project
)
{
create
(
:project
)
}
...
...
@@ -52,7 +52,7 @@ feature 'Task Lists' do
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
}
.js-task-list-field"
)
expect
(
page
).
to
have_selector
(
'form.js-issue-update'
)
expect
(
page
).
to
have_selector
(
'form.js-issu
abl
e-update'
)
expect
(
page
).
to
have_selector
(
'a.btn-close'
)
end
...
...
@@ -128,7 +128,7 @@ feature 'Task Lists' do
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
}
.js-task-list-field"
)
expect
(
page
).
to
have_selector
(
'form.js-
merge-request
-update'
)
expect
(
page
).
to
have_selector
(
'form.js-
issuable
-update'
)
expect
(
page
).
to
have_selector
(
'a.btn-close'
)
end
...
...
spec/javascripts/fixtures/issues_show.html.haml
View file @
b9fa82da
...
...
@@ -10,4 +10,4 @@
%textarea
.js-task-list-field
\- [ ] Task List Item
%form
.js-issue-update
{
action:
'/foo'
}
%form
.js-issu
abl
e-update
{
action:
'/foo'
}
spec/javascripts/fixtures/merge_requests_show.html.haml
View file @
b9fa82da
...
...
@@ -10,4 +10,4 @@
%textarea
.js-task-list-field
\- [ ] Task List Item
%form
.js-
merge-request
-update
{
action:
'/foo'
}
%form
.js-
issuable
-update
{
action:
'/foo'
}
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