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
584ea586
Commit
584ea586
authored
May 10, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed tests on textarea looking for innerText instead of value
parent
598b05df
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
7 deletions
+6
-7
app/controllers/projects/issues_controller.rb
app/controllers/projects/issues_controller.rb
+0
-1
spec/javascripts/issue_show/components/app_spec.js
spec/javascripts/issue_show/components/app_spec.js
+3
-3
spec/javascripts/issue_show/mock_data.js
spec/javascripts/issue_show/mock_data.js
+3
-3
No files found.
app/controllers/projects/issues_controller.rb
View file @
584ea586
...
@@ -208,7 +208,6 @@ class Projects::IssuesController < Projects::ApplicationController
...
@@ -208,7 +208,6 @@ class Projects::IssuesController < Projects::ApplicationController
description:
view_context
.
markdown_field
(
@issue
,
:description
),
description:
view_context
.
markdown_field
(
@issue
,
:description
),
description_text:
@issue
.
description
,
description_text:
@issue
.
description
,
task_status:
@issue
.
task_status
,
task_status:
@issue
.
task_status
,
issue_number:
@issue
.
iid
,
updated_at:
@issue
.
updated_at
,
updated_at:
@issue
.
updated_at
,
}
}
end
end
...
...
spec/javascripts/issue_show/components/app_spec.js
View file @
584ea586
...
@@ -13,7 +13,7 @@ const issueShowInterceptor = data => (request, next) => {
...
@@ -13,7 +13,7 @@ const issueShowInterceptor = data => (request, next) => {
}));
}));
};
};
describe
(
'
Issuable output
'
,
()
=>
{
f
describe
(
'
Issuable output
'
,
()
=>
{
document
.
body
.
innerHTML
=
'
<span id="task_status"></span>
'
;
document
.
body
.
innerHTML
=
'
<span id="task_status"></span>
'
;
let
vm
;
let
vm
;
...
@@ -43,7 +43,7 @@ describe('Issuable output', () => {
...
@@ -43,7 +43,7 @@ describe('Issuable output', () => {
expect
(
document
.
querySelector
(
'
title
'
).
innerText
).
toContain
(
'
this is a title (#1)
'
);
expect
(
document
.
querySelector
(
'
title
'
).
innerText
).
toContain
(
'
this is a title (#1)
'
);
expect
(
vm
.
$el
.
querySelector
(
'
.title
'
).
innerHTML
).
toContain
(
'
<p>this is a title</p>
'
);
expect
(
vm
.
$el
.
querySelector
(
'
.title
'
).
innerHTML
).
toContain
(
'
<p>this is a title</p>
'
);
expect
(
vm
.
$el
.
querySelector
(
'
.wiki
'
).
innerHTML
).
toContain
(
'
<p>this is a description!</p>
'
);
expect
(
vm
.
$el
.
querySelector
(
'
.wiki
'
).
innerHTML
).
toContain
(
'
<p>this is a description!</p>
'
);
expect
(
vm
.
$el
.
querySelector
(
'
.js-task-list-field
'
).
innerText
).
toContain
(
'
this is a description
'
);
expect
(
vm
.
$el
.
querySelector
(
'
.js-task-list-field
'
).
value
).
toContain
(
'
this is a description
'
);
Vue
.
http
.
interceptors
.
push
(
issueShowInterceptor
(
issueShowData
.
secondRequest
));
Vue
.
http
.
interceptors
.
push
(
issueShowInterceptor
(
issueShowData
.
secondRequest
));
...
@@ -51,7 +51,7 @@ describe('Issuable output', () => {
...
@@ -51,7 +51,7 @@ describe('Issuable output', () => {
expect
(
document
.
querySelector
(
'
title
'
).
innerText
).
toContain
(
'
2 (#1)
'
);
expect
(
document
.
querySelector
(
'
title
'
).
innerText
).
toContain
(
'
2 (#1)
'
);
expect
(
vm
.
$el
.
querySelector
(
'
.title
'
).
innerHTML
).
toContain
(
'
<p>2</p>
'
);
expect
(
vm
.
$el
.
querySelector
(
'
.title
'
).
innerHTML
).
toContain
(
'
<p>2</p>
'
);
expect
(
vm
.
$el
.
querySelector
(
'
.wiki
'
).
innerHTML
).
toContain
(
'
<p>42</p>
'
);
expect
(
vm
.
$el
.
querySelector
(
'
.wiki
'
).
innerHTML
).
toContain
(
'
<p>42</p>
'
);
expect
(
vm
.
$el
.
querySelector
(
'
.js-task-list-field
'
).
innerText
).
toContain
(
'
42
'
);
expect
(
vm
.
$el
.
querySelector
(
'
.js-task-list-field
'
).
value
).
toContain
(
'
42
'
);
done
();
done
();
});
});
...
...
spec/javascripts/issue_show/mock_data.js
View file @
584ea586
...
@@ -4,23 +4,23 @@ export default {
...
@@ -4,23 +4,23 @@ export default {
title_text
:
'
this is a title
'
,
title_text
:
'
this is a title
'
,
description
:
'
<p>this is a description!</p>
'
,
description
:
'
<p>this is a description!</p>
'
,
description_text
:
'
this is a description
'
,
description_text
:
'
this is a description
'
,
issue_number
:
1
,
task_status
:
'
2 of 4 completed
'
,
task_status
:
'
2 of 4 completed
'
,
updated_at
:
new
Date
().
toString
(),
},
},
secondRequest
:
{
secondRequest
:
{
title
:
'
<p>2</p>
'
,
title
:
'
<p>2</p>
'
,
title_text
:
'
2
'
,
title_text
:
'
2
'
,
description
:
'
<p>42</p>
'
,
description
:
'
<p>42</p>
'
,
description_text
:
'
42
'
,
description_text
:
'
42
'
,
issue_number
:
1
,
task_status
:
'
0 of 0 completed
'
,
task_status
:
'
0 of 0 completed
'
,
updated_at
:
new
Date
().
toString
(),
},
},
issueSpecRequest
:
{
issueSpecRequest
:
{
title
:
'
<p>this is a title</p>
'
,
title
:
'
<p>this is a title</p>
'
,
title_text
:
'
this is a title
'
,
title_text
:
'
this is a title
'
,
description
:
'
<li class="task-list-item enabled"><input type="checkbox" class="task-list-item-checkbox">Task List Item</li>
'
,
description
:
'
<li class="task-list-item enabled"><input type="checkbox" class="task-list-item-checkbox">Task List Item</li>
'
,
description_text
:
'
- [ ] Task List Item
'
,
description_text
:
'
- [ ] Task List Item
'
,
issue_number
:
1
,
task_status
:
'
0 of 1 completed
'
,
task_status
:
'
0 of 1 completed
'
,
updated_at
:
new
Date
().
toString
(),
},
},
};
};
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