Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
059f47b6
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,发现更多精彩内容 >>
提交
059f47b6
编写于
2月 14, 2017
作者:
C
Clement Ho
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dynamic-todos-fixture' into 'master'
Replace static fixture for right_sidebar_spec.js See merge request !9211
上级
815cb808
d8517fd4
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
59 addition
and
6 deletion
+59
-6
changelogs/unreleased/dynamic-todos-fixture.yml
changelogs/unreleased/dynamic-todos-fixture.yml
+4
-0
spec/javascripts/fixtures/.gitignore
spec/javascripts/fixtures/.gitignore
+1
-0
spec/javascripts/fixtures/todos.json
spec/javascripts/fixtures/todos.json
+0
-4
spec/javascripts/fixtures/todos.rb
spec/javascripts/fixtures/todos.rb
+52
-0
spec/javascripts/right_sidebar_spec.js
spec/javascripts/right_sidebar_spec.js
+2
-2
未找到文件。
changelogs/unreleased/dynamic-todos-fixture.yml
0 → 100644
浏览文件 @
059f47b6
---
title
:
Replace static fixture for right_sidebar_spec.js
merge_request
:
9211
author
:
winniehell
spec/javascripts/fixtures/.gitignore
浏览文件 @
059f47b6
*.html.raw
*.json
spec/javascripts/fixtures/todos.json
已删除
100644 → 0
浏览文件 @
815cb808
{
"count"
:
1
,
"delete_path"
:
"/dashboard/todos/1"
}
\ No newline at end of file
spec/javascripts/fixtures/todos.rb
0 → 100644
浏览文件 @
059f47b6
require
'spec_helper'
describe
'Todos (JavaScript fixtures)'
do
include
JavaScriptFixturesHelpers
let
(
:admin
)
{
create
(
:admin
)
}
let
(
:namespace
)
{
create
(
:namespace
,
name:
'frontend-fixtures'
)}
let
(
:project
)
{
create
(
:project_empty_repo
,
namespace:
namespace
,
path:
'todos-project'
)
}
let
(
:issue_1
)
{
create
(
:issue
,
title:
'issue_1'
,
project:
project
)
}
let!
(
:todo_1
)
{
create
(
:todo
,
user:
admin
,
project:
project
,
target:
issue_1
,
created_at:
5
.
hours
.
ago
)
}
let
(
:issue_2
)
{
create
(
:issue
,
title:
'issue_2'
,
project:
project
)
}
let!
(
:todo_2
)
{
create
(
:todo
,
:done
,
user:
admin
,
project:
project
,
target:
issue_2
,
created_at:
50
.
hours
.
ago
)
}
before
(
:all
)
do
clean_frontend_fixtures
(
'todos/'
)
end
describe
Dashboard
::
TodosController
,
'(JavaScript fixtures)'
,
type: :controller
do
render_views
before
(
:each
)
do
sign_in
(
admin
)
end
it
'todos/todos.html.raw'
do
|
example
|
get
:index
expect
(
response
).
to
be_success
store_frontend_fixture
(
response
,
example
.
description
)
end
end
describe
Projects
::
TodosController
,
'(JavaScript fixtures)'
,
type: :controller
do
render_views
before
(
:each
)
do
sign_in
(
admin
)
end
it
'todos/todos.json'
do
|
example
|
post
:create
,
namespace_id:
namespace
.
path
,
project_id:
project
.
path
,
issuable_type:
'issue'
,
issuable_id:
issue_2
.
id
,
format:
'json'
expect
(
response
).
to
be_success
store_frontend_fixture
(
response
,
example
.
description
)
end
end
end
spec/javascripts/right_sidebar_spec.js
浏览文件 @
059f47b6
...
...
@@ -34,7 +34,7 @@ require('~/extensions/jquery.js');
describe
(
'
RightSidebar
'
,
function
()
{
var
fixtureName
=
'
issues/open-issue.html.raw
'
;
preloadFixtures
(
fixtureName
);
loadJSONFixtures
(
'
todos.json
'
);
loadJSONFixtures
(
'
todos
/todos
.json
'
);
beforeEach
(
function
()
{
loadFixtures
(
fixtureName
);
...
...
@@ -64,7 +64,7 @@ require('~/extensions/jquery.js');
});
it
(
'
should broadcast todo:toggle event when add todo clicked
'
,
function
()
{
var
todos
=
getJSONFixture
(
'
todos.json
'
);
var
todos
=
getJSONFixture
(
'
todos
/todos
.json
'
);
spyOn
(
jQuery
,
'
ajax
'
).
and
.
callFake
(
function
()
{
var
d
=
$
.
Deferred
();
var
response
=
todos
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录