Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
d956f68a
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d956f68a
编写于
9月 11, 2019
作者:
W
Winnie Hellmann
提交者:
Mike Greiling
9月 11, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Replacing vue-resource with axios in Markdown field
上级
1a5c262a
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
26 addition
and
22 deletion
+26
-22
app/assets/javascripts/vue_shared/components/markdown/field.vue
...sets/javascripts/vue_shared/components/markdown/field.vue
+3
-3
changelogs/unreleased/61385-replace-vue-resource.yml
changelogs/unreleased/61385-replace-vue-resource.yml
+5
-0
spec/javascripts/vue_shared/components/markdown/field_spec.js
.../javascripts/vue_shared/components/markdown/field_spec.js
+18
-19
未找到文件。
app/assets/javascripts/vue_shared/components/markdown/field.vue
浏览文件 @
d956f68a
...
...
@@ -9,6 +9,7 @@ import markdownHeader from './header.vue';
import
markdownToolbar
from
'
./toolbar.vue
'
;
import
icon
from
'
../icon.vue
'
;
import
Suggestions
from
'
~/vue_shared/components/markdown/suggestions.vue
'
;
import
axios
from
'
~/lib/utils/axios_utils
'
;
export
default
{
components
:
{
...
...
@@ -167,10 +168,9 @@ export default {
if
(
text
)
{
this
.
markdownPreviewLoading
=
true
;
this
.
markdownPreview
=
__
(
'
Loading…
'
);
this
.
$http
axios
.
post
(
this
.
markdownPreviewPath
,
{
text
})
.
then
(
resp
=>
resp
.
json
())
.
then
(
data
=>
this
.
renderMarkdown
(
data
))
.
then
(
response
=>
this
.
renderMarkdown
(
response
.
data
))
.
catch
(()
=>
new
Flash
(
__
(
'
Error loading markdown preview
'
)));
}
else
{
this
.
renderMarkdown
();
...
...
changelogs/unreleased/61385-replace-vue-resource.yml
0 → 100644
浏览文件 @
d956f68a
---
title
:
Replaced vue resource to axios in the Markdown field preview component
merge_request
:
32742
author
:
Prakash Chokalingam @prakash_Chokalingam
type
:
fixed
spec/javascripts/vue_shared/components/markdown/field_spec.js
浏览文件 @
d956f68a
import
$
from
'
jquery
'
;
import
'
~/behaviors/markdown/render_gfm
'
;
import
Vue
from
'
vue
'
;
import
AxiosMockAdapter
from
'
axios-mock-adapter
'
;
import
axios
from
'
~/lib/utils/axios_utils
'
;
import
fieldComponent
from
'
~/vue_shared/components/markdown/field.vue
'
;
import
{
TEST_HOST
}
from
'
spec/test_constants
'
;
function
assertMarkdownTabs
(
isWrite
,
writeLink
,
previewLink
,
vm
)
{
expect
(
writeLink
.
parentNode
.
classList
.
contains
(
'
active
'
)).
toEqual
(
isWrite
);
...
...
@@ -9,9 +13,13 @@ function assertMarkdownTabs(isWrite, writeLink, previewLink, vm) {
}
describe
(
'
Markdown field component
'
,
()
=>
{
const
markdownPreviewPath
=
`
${
TEST_HOST
}
/preview`
;
const
markdownDocsPath
=
`
${
TEST_HOST
}
/docs`
;
let
axiosMock
;
let
vm
;
beforeEach
(
done
=>
{
axiosMock
=
new
AxiosMockAdapter
(
axios
);
vm
=
new
Vue
({
components
:
{
fieldComponent
,
...
...
@@ -23,8 +31,8 @@ describe('Markdown field component', () => {
},
template
:
`
<field-component
markdown-preview-path="
/preview
"
markdown-docs-path="
/docs
"
markdown-preview-path="
${
markdownPreviewPath
}
"
markdown-docs-path="
${
markdownDocsPath
}
"
>
<textarea
slot="textarea"
...
...
@@ -37,7 +45,13 @@ describe('Markdown field component', () => {
Vue
.
nextTick
(
done
);
});
afterEach
(()
=>
{
axiosMock
.
restore
();
});
describe
(
'
mounted
'
,
()
=>
{
const
previewHTML
=
'
<p>markdown preview</p>
'
;
it
(
'
renders textarea inside backdrop
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.zen-backdrop textarea
'
)).
not
.
toBeNull
();
});
...
...
@@ -47,20 +61,7 @@ describe('Markdown field component', () => {
let
writeLink
;
beforeEach
(()
=>
{
spyOn
(
Vue
.
http
,
'
post
'
).
and
.
callFake
(
()
=>
new
Promise
(
resolve
=>
{
setTimeout
(()
=>
{
resolve
({
json
()
{
return
{
body
:
'
<p>markdown preview</p>
'
,
};
},
});
});
}),
);
axiosMock
.
onPost
(
markdownPreviewPath
).
replyOnce
(
200
,
{
body
:
previewHTML
});
previewLink
=
vm
.
$el
.
querySelector
(
'
.nav-links .js-preview-link
'
);
writeLink
=
vm
.
$el
.
querySelector
(
'
.nav-links .js-write-link
'
);
...
...
@@ -92,9 +93,7 @@ describe('Markdown field component', () => {
previewLink
.
click
();
setTimeout
(()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.md-preview-holder
'
).
innerHTML
).
toContain
(
'
<p>markdown preview</p>
'
,
);
expect
(
vm
.
$el
.
querySelector
(
'
.md-preview-holder
'
).
innerHTML
).
toContain
(
previewHTML
);
done
();
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录