Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
ac9e65a9
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,发现更多精彩内容 >>
提交
ac9e65a9
编写于
12月 15, 2017
作者:
E
Eric Eastwood
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Switch blob/notebook to Axios
上级
254c0754
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
23 addition
and
39 deletion
+23
-39
app/assets/javascripts/blob/notebook/index.js
app/assets/javascripts/blob/notebook/index.js
+6
-8
spec/javascripts/blob/notebook/index_spec.js
spec/javascripts/blob/notebook/index_spec.js
+17
-31
未找到文件。
app/assets/javascripts/blob/notebook/index.js
浏览文件 @
ac9e65a9
/* eslint-disable no-new */
import
Vue
from
'
vue
'
;
import
VueResource
from
'
vue-resource
'
;
import
axios
from
'
../../lib/utils/axios_utils
'
;
import
notebookLab
from
'
../../notebook/index.vue
'
;
Vue
.
use
(
VueResource
);
export
default
()
=>
{
const
el
=
document
.
getElementById
(
'
js-notebook-viewer
'
);
...
...
@@ -50,14 +48,14 @@ export default () => {
`
,
methods
:
{
loadFile
()
{
this
.
$http
.
get
(
el
.
dataset
.
endpoint
)
.
then
(
res
ponse
=>
response
.
json
()
)
.
then
((
res
)
=>
{
this
.
json
=
res
;
axios
.
get
(
el
.
dataset
.
endpoint
)
.
then
(
res
=>
res
.
data
)
.
then
((
data
)
=>
{
this
.
json
=
data
;
this
.
loading
=
false
;
})
.
catch
((
e
)
=>
{
if
(
e
.
status
)
{
if
(
e
.
status
!==
200
)
{
this
.
loadError
=
true
;
}
...
...
spec/javascripts/blob/notebook/index_spec.js
浏览文件 @
ac9e65a9
import
Vue
from
'
vue
'
;
import
MockAdapter
from
'
axios-mock-adapter
'
;
import
axios
from
'
~/lib/utils/axios_utils
'
;
import
renderNotebook
from
'
~/blob/notebook
'
;
describe
(
'
iPython notebook renderer
'
,
()
=>
{
...
...
@@ -17,8 +18,11 @@ describe('iPython notebook renderer', () => {
});
describe
(
'
successful response
'
,
()
=>
{
const
response
=
(
request
,
next
)
=>
{
next
(
request
.
respondWith
(
JSON
.
stringify
({
let
mock
;
beforeEach
((
done
)
=>
{
mock
=
new
MockAdapter
(
axios
);
mock
.
onGet
(
'
/test
'
).
reply
(
200
,
{
cells
:
[{
cell_type
:
'
markdown
'
,
source
:
[
'
# test
'
],
...
...
@@ -31,13 +35,7 @@ describe('iPython notebook renderer', () => {
],
outputs
:
[],
}],
}),
{
status
:
200
,
}));
};
beforeEach
((
done
)
=>
{
Vue
.
http
.
interceptors
.
push
(
response
);
});
renderNotebook
();
...
...
@@ -47,9 +45,7 @@ describe('iPython notebook renderer', () => {
});
afterEach
(()
=>
{
Vue
.
http
.
interceptors
=
_
.
without
(
Vue
.
http
.
interceptors
,
response
,
);
mock
.
reset
();
});
it
(
'
does not show loading icon
'
,
()
=>
{
...
...
@@ -86,14 +82,11 @@ describe('iPython notebook renderer', () => {
});
describe
(
'
error in JSON response
'
,
()
=>
{
const
response
=
(
request
,
next
)
=>
{
next
(
request
.
respondWith
(
'
{ "cells": [{"cell_type": "markdown"} }
'
,
{
status
:
200
,
}));
};
let
mock
;
beforeEach
((
done
)
=>
{
Vue
.
http
.
interceptors
.
push
(
response
);
mock
=
new
MockAdapter
(
axios
);
mock
.
onGet
(
'
/test
'
).
reply
(()
=>
Promise
.
reject
({
status
:
200
,
data
:
'
{ "cells": [{"cell_type": "markdown"} }
'
}));
renderNotebook
();
...
...
@@ -103,9 +96,7 @@ describe('iPython notebook renderer', () => {
});
afterEach
(()
=>
{
Vue
.
http
.
interceptors
=
_
.
without
(
Vue
.
http
.
interceptors
,
response
,
);
mock
.
reset
();
});
it
(
'
does not show loading icon
'
,
()
=>
{
...
...
@@ -122,14 +113,11 @@ describe('iPython notebook renderer', () => {
});
describe
(
'
error getting file
'
,
()
=>
{
const
response
=
(
request
,
next
)
=>
{
next
(
request
.
respondWith
(
''
,
{
status
:
500
,
}));
};
let
mock
;
beforeEach
((
done
)
=>
{
Vue
.
http
.
interceptors
.
push
(
response
);
mock
=
new
MockAdapter
(
axios
);
mock
.
onGet
(
'
/test
'
).
reply
(
500
,
''
);
renderNotebook
();
...
...
@@ -139,9 +127,7 @@ describe('iPython notebook renderer', () => {
});
afterEach
(()
=>
{
Vue
.
http
.
interceptors
=
_
.
without
(
Vue
.
http
.
interceptors
,
response
,
);
mock
.
reset
();
});
it
(
'
does not show loading icon
'
,
()
=>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录