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
9c521c85
Commit
9c521c85
authored
Jul 17, 2017
by
Luke "Jared" Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Made BlobViewer jasmine integration spec use snippets view instead of pblob view
parent
bc44e646
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
9 deletions
+7
-9
spec/javascripts/blob/viewer/index_spec.js
spec/javascripts/blob/viewer/index_spec.js
+2
-2
spec/javascripts/fixtures/snippet.rb
spec/javascripts/fixtures/snippet.rb
+5
-7
No files found.
spec/javascripts/blob/viewer/index_spec.js
View file @
9c521c85
...
@@ -3,10 +3,10 @@ import BlobViewer from '~/blob/viewer/index';
...
@@ -3,10 +3,10 @@ import BlobViewer from '~/blob/viewer/index';
describe
(
'
Blob viewer
'
,
()
=>
{
describe
(
'
Blob viewer
'
,
()
=>
{
let
blob
;
let
blob
;
preloadFixtures
(
'
blob
/show.html.raw
'
);
preloadFixtures
(
'
snippets
/show.html.raw
'
);
beforeEach
(()
=>
{
beforeEach
(()
=>
{
loadFixtures
(
'
blob
/show.html.raw
'
);
loadFixtures
(
'
snippets
/show.html.raw
'
);
$
(
'
#modal-upload-blob
'
).
remove
();
$
(
'
#modal-upload-blob
'
).
remove
();
blob
=
new
BlobViewer
();
blob
=
new
BlobViewer
();
...
...
spec/javascripts/fixtures/
blob
.rb
→
spec/javascripts/fixtures/
snippet
.rb
View file @
9c521c85
require
'spec_helper'
require
'spec_helper'
describe
Projects
::
Blob
Controller
,
'(JavaScript fixtures)'
,
type: :controller
do
describe
Snippets
Controller
,
'(JavaScript fixtures)'
,
type: :controller
do
include
JavaScriptFixturesHelpers
include
JavaScriptFixturesHelpers
let
(
:admin
)
{
create
(
:admin
)
}
let
(
:admin
)
{
create
(
:admin
)
}
let
(
:namespace
)
{
create
(
:namespace
,
name:
'frontend-fixtures'
)}
let
(
:namespace
)
{
create
(
:namespace
,
name:
'frontend-fixtures'
)}
let
(
:project
)
{
create
(
:project
,
:repository
,
namespace:
namespace
,
path:
'branches-project'
)
}
let
(
:project
)
{
create
(
:project
,
:repository
,
namespace:
namespace
,
path:
'branches-project'
)
}
let
(
:snippet
)
{
create
(
:personal_snippet
,
title:
'snippet.md'
,
content:
'# snippet'
,
file_name:
'snippet.md'
,
author:
admin
)
}
render_views
render_views
before
(
:all
)
do
before
(
:all
)
do
clean_frontend_fixtures
(
'
blob
/'
)
clean_frontend_fixtures
(
'
snippets
/'
)
end
end
before
(
:each
)
do
before
(
:each
)
do
sign_in
(
admin
)
sign_in
(
admin
)
end
end
it
'blob/show.html.raw'
do
|
example
|
it
'snippets/show.html.raw'
do
|
example
|
get
(
:show
,
get
(
:show
,
id:
snippet
.
to_param
)
namespace_id:
project
.
namespace
,
project_id:
project
,
id:
'add-ipython-files/files/ipython/basic.ipynb'
)
expect
(
response
).
to
be_success
expect
(
response
).
to
be_success
store_frontend_fixture
(
response
,
example
.
description
)
store_frontend_fixture
(
response
,
example
.
description
)
...
...
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