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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
bc1b305d
Commit
bc1b305d
authored
Nov 23, 2016
by
winniehell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace static fixture for right_sidebar_spec (!7687)
parent
84638de6
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
25 deletions
+10
-25
changelogs/unreleased/right-sidebar-fixture.yml
changelogs/unreleased/right-sidebar-fixture.yml
+4
-0
spec/javascripts/fixtures/right_sidebar.html.haml
spec/javascripts/fixtures/right_sidebar.html.haml
+0
-17
spec/javascripts/right_sidebar_spec.js
spec/javascripts/right_sidebar_spec.js
+6
-8
No files found.
changelogs/unreleased/right-sidebar-fixture.yml
0 → 100644
View file @
bc1b305d
---
title
:
Replace static fixture for right_sidebar_spec
merge_request
:
7687
author
:
winniehell
spec/javascripts/fixtures/right_sidebar.html.haml
deleted
100644 → 0
View file @
84638de6
%div
%div
.page-gutter.page-with-sidebar
%aside
.right-sidebar
%div
.block.issuable-sidebar-header
%a
.gutter-toggle.pull-right.js-sidebar-toggle
%i
.fa.fa-angle-double-left
%button
.btn.btn-default.issuable-header-btn.pull-right.js-issuable-todo
{
type:
"button"
,
data:
{
todo_text:
"Add todo"
,
mark_text:
"Mark done"
,
issuable_id:
"1"
,
issuable_type:
"issue"
,
url:
"/todos"
}}
%span
.js-issuable-todo-text
Add todo
%i
.fa.fa-spin.fa-spinner.js-issuable-todo-loading.hidden
%form
.issuable-context-form
%div
.block.labels
%div
.sidebar-collapsed-icon
%i
.fa.fa-tags
%span
1
spec/javascripts/right_sidebar_spec.js
View file @
bc1b305d
...
@@ -34,9 +34,10 @@
...
@@ -34,9 +34,10 @@
};
};
describe
(
'
RightSidebar
'
,
function
()
{
describe
(
'
RightSidebar
'
,
function
()
{
fixture
.
preload
(
'
right_sidebar.html
'
);
var
fixtureName
=
'
issues/open-issue.html.raw
'
;
fixture
.
preload
(
fixtureName
);
beforeEach
(
function
()
{
beforeEach
(
function
()
{
fixture
.
load
(
'
right_sidebar.html
'
);
fixture
.
load
(
fixtureName
);
this
.
sidebar
=
new
Sidebar
;
this
.
sidebar
=
new
Sidebar
;
$aside
=
$
(
'
.right-sidebar
'
);
$aside
=
$
(
'
.right-sidebar
'
);
$page
=
$
(
'
.page-with-sidebar
'
);
$page
=
$
(
'
.page-with-sidebar
'
);
...
@@ -44,15 +45,12 @@
...
@@ -44,15 +45,12 @@
$toggle
=
$aside
.
find
(
'
.js-sidebar-toggle
'
);
$toggle
=
$aside
.
find
(
'
.js-sidebar-toggle
'
);
return
$labelsIcon
=
$aside
.
find
(
'
.sidebar-collapsed-icon
'
);
return
$labelsIcon
=
$aside
.
find
(
'
.sidebar-collapsed-icon
'
);
});
});
it
(
'
should expand the sidebar when arrow is clicked
'
,
function
()
{
it
(
'
should expand/collapse the sidebar when arrow is clicked
'
,
function
()
{
assertSidebarState
(
'
expanded
'
);
$toggle
.
click
();
$toggle
.
click
();
return
assertSidebarState
(
'
expanded
'
);
assertSidebarState
(
'
collapsed
'
);
});
it
(
'
should collapse the sidebar when arrow is clicked
'
,
function
()
{
$toggle
.
click
();
$toggle
.
click
();
assertSidebarState
(
'
expanded
'
);
assertSidebarState
(
'
expanded
'
);
$toggle
.
click
();
return
assertSidebarState
(
'
collapsed
'
);
});
});
it
(
'
should float over the page and when sidebar icons clicked
'
,
function
()
{
it
(
'
should float over the page and when sidebar icons clicked
'
,
function
()
{
$labelsIcon
.
click
();
$labelsIcon
.
click
();
...
...
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