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
ced971b1
Commit
ced971b1
authored
Feb 14, 2017
by
Simon Knox
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
code style and test fixes
fix test following
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9172
parent
cea0996a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
task_list.js
app/assets/javascripts/task_list.js
+0
-0
merge_request_spec.js
spec/javascripts/merge_request_spec.js
+3
-3
notes_spec.js
spec/javascripts/notes_spec.js
+1
-1
No files found.
app/assets/javascripts/task_list.js
.es6
→
app/assets/javascripts/task_list.js
View file @
ced971b1
File moved
spec/javascripts/merge_request_spec.js
View file @
ced971b1
...
...
@@ -6,9 +6,9 @@ require('~/merge_request');
(
function
()
{
describe
(
'MergeRequest'
,
function
()
{
return
describe
(
'task lists'
,
function
()
{
preloadFixtures
(
'
static/merge_requests_show
.html.raw'
);
preloadFixtures
(
'
merge_requests/merge_request_with_task_list
.html.raw'
);
beforeEach
(
function
()
{
loadFixtures
(
'
static/merge_requests_show
.html.raw'
);
loadFixtures
(
'
merge_requests/merge_request_with_task_list
.html.raw'
);
return
this
.
merge
=
new
MergeRequest
();
});
it
(
'modifies the Markdown field'
,
function
()
{
...
...
@@ -19,7 +19,7 @@ require('~/merge_request');
return
it
(
'submits an ajax request on tasklist:changed'
,
function
()
{
spyOn
(
jQuery
,
'ajax'
).
and
.
callFake
(
function
(
req
)
{
expect
(
req
.
type
).
toBe
(
'PATCH'
);
expect
(
req
.
url
).
toBe
(
'/foo'
);
expect
(
req
.
url
).
toBe
(
`
${
gl
.
TEST_HOST
}
/frontend-fixtures/merge-requests-project/merge_requests/1.json`
);
return
expect
(
req
.
data
.
merge_request
.
description
).
not
.
toBe
(
null
);
});
return
$
(
'.js-task-list-field'
).
trigger
(
'tasklist:changed'
);
...
...
spec/javascripts/notes_spec.js
View file @
ced971b1
...
...
@@ -41,7 +41,7 @@ require('~/lib/utils/text_utility');
expect
(
req
.
url
).
toBe
(
'http://test.host/frontend-fixtures/issues-project/notes/1'
);
return
expect
(
req
.
data
.
note
).
not
.
toBe
(
null
);
});
return
$
(
'.js-task-list-field'
).
trigger
(
'tasklist:changed'
);
$
(
'.js-task-list-field'
).
trigger
(
'tasklist:changed'
);
});
});
...
...
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