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
d8517fd4
Commit
d8517fd4
authored
Feb 14, 2017
by
winniehell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace static fixture for right_sidebar_spec.js (!9211)
parent
b06ac70a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
38 additions
and
15 deletions
+38
-15
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
+31
-9
spec/javascripts/right_sidebar_spec.js
spec/javascripts/right_sidebar_spec.js
+2
-2
No files found.
changelogs/unreleased/dynamic-todos-fixture.yml
0 → 100644
View file @
d8517fd4
---
title
:
Replace static fixture for right_sidebar_spec.js
merge_request
:
9211
author
:
winniehell
spec/javascripts/fixtures/.gitignore
View file @
d8517fd4
*.html.raw
*.json
spec/javascripts/fixtures/todos.json
deleted
100644 → 0
View file @
b06ac70a
{
"count"
:
1
,
"delete_path"
:
"/dashboard/todos/1"
}
\ No newline at end of file
spec/javascripts/fixtures/todos.rb
View file @
d8517fd4
require
'spec_helper'
describe
Dashboard
::
TodosController
,
'(JavaScript fixtures)'
,
type: :controller
do
describe
'Todos (JavaScript fixtures)'
do
include
JavaScriptFixturesHelpers
let
(
:admin
)
{
create
(
:admin
)
}
...
...
@@ -11,20 +11,42 @@ describe Dashboard::TodosController, '(JavaScript fixtures)', type: :controller
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
)
}
render_views
before
(
:all
)
do
clean_frontend_fixtures
(
'todos/'
)
end
before
(
:each
)
do
sign_in
(
admin
)
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
it
'todos/todos.html.raw'
do
|
example
|
get
:index
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
)
expect
(
response
).
to
be_success
store_frontend_fixture
(
response
,
example
.
description
)
end
end
end
spec/javascripts/right_sidebar_spec.js
View file @
d8517fd4
...
...
@@ -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
;
...
...
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