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
d152a74c
Commit
d152a74c
authored
Apr 25, 2019
by
Winnie Hellmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move all static fixtures to static directory
parent
8a07d5e6
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
9 additions
and
9 deletions
+9
-9
spec/javascripts/fixtures/static/images/green_box.png
spec/javascripts/fixtures/static/images/green_box.png
+0
-0
spec/javascripts/fixtures/static/images/one_white_pixel.png
spec/javascripts/fixtures/static/images/one_white_pixel.png
+0
-0
spec/javascripts/fixtures/static/images/red_box.png
spec/javascripts/fixtures/static/images/red_box.png
+0
-0
spec/javascripts/fixtures/static/projects.json
spec/javascripts/fixtures/static/projects.json
+0
-0
spec/javascripts/gl_dropdown_spec.js
spec/javascripts/gl_dropdown_spec.js
+2
-2
spec/javascripts/test_constants.js
spec/javascripts/test_constants.js
+3
-3
spec/javascripts/vue_shared/components/project_selector/project_list_item_spec.js
...red/components/project_selector/project_list_item_spec.js
+2
-2
spec/javascripts/vue_shared/components/project_selector/project_selector_spec.js
...ared/components/project_selector/project_selector_spec.js
+2
-2
No files found.
spec/javascripts/fixtures/images/green_box.png
→
spec/javascripts/fixtures/
static/
images/green_box.png
View file @
d152a74c
File moved
spec/javascripts/fixtures/one_white_pixel.png
→
spec/javascripts/fixtures/
static/images/
one_white_pixel.png
View file @
d152a74c
File moved
spec/javascripts/fixtures/images/red_box.png
→
spec/javascripts/fixtures/
static/
images/red_box.png
View file @
d152a74c
File moved
spec/javascripts/fixtures/projects.json
→
spec/javascripts/fixtures/
static/
projects.json
View file @
d152a74c
File moved
spec/javascripts/gl_dropdown_spec.js
View file @
d152a74c
...
@@ -6,7 +6,7 @@ import '~/lib/utils/common_utils';
...
@@ -6,7 +6,7 @@ import '~/lib/utils/common_utils';
describe
(
'
glDropdown
'
,
function
describeDropdown
()
{
describe
(
'
glDropdown
'
,
function
describeDropdown
()
{
preloadFixtures
(
'
static/gl_dropdown.html
'
);
preloadFixtures
(
'
static/gl_dropdown.html
'
);
loadJSONFixtures
(
'
projects.json
'
);
loadJSONFixtures
(
'
static/
projects.json
'
);
const
NON_SELECTABLE_CLASSES
=
const
NON_SELECTABLE_CLASSES
=
'
.divider, .separator, .dropdown-header, .dropdown-menu-empty-item
'
;
'
.divider, .separator, .dropdown-header, .dropdown-menu-empty-item
'
;
...
@@ -67,7 +67,7 @@ describe('glDropdown', function describeDropdown() {
...
@@ -67,7 +67,7 @@ describe('glDropdown', function describeDropdown() {
loadFixtures
(
'
static/gl_dropdown.html
'
);
loadFixtures
(
'
static/gl_dropdown.html
'
);
this
.
dropdownContainerElement
=
$
(
'
.dropdown.inline
'
);
this
.
dropdownContainerElement
=
$
(
'
.dropdown.inline
'
);
this
.
$dropdownMenuElement
=
$
(
'
.dropdown-menu
'
,
this
.
dropdownContainerElement
);
this
.
$dropdownMenuElement
=
$
(
'
.dropdown-menu
'
,
this
.
dropdownContainerElement
);
this
.
projectsData
=
getJSONFixture
(
'
projects.json
'
);
this
.
projectsData
=
getJSONFixture
(
'
static/
projects.json
'
);
});
});
afterEach
(()
=>
{
afterEach
(()
=>
{
...
...
spec/javascripts/test_constants.js
View file @
d152a74c
export
const
FIXTURES_PATH
=
'
/base/spec/javascripts/fixtures
'
;
export
const
FIXTURES_PATH
=
'
/base/spec/javascripts/fixtures
'
;
export
const
TEST_HOST
=
'
http://test.host
'
;
export
const
TEST_HOST
=
'
http://test.host
'
;
export
const
DUMMY_IMAGE_URL
=
`
${
FIXTURES_PATH
}
/one_white_pixel.png`
;
export
const
DUMMY_IMAGE_URL
=
`
${
FIXTURES_PATH
}
/
static/images/
one_white_pixel.png`
;
export
const
GREEN_BOX_IMAGE_URL
=
`
${
FIXTURES_PATH
}
/images/green_box.png`
;
export
const
GREEN_BOX_IMAGE_URL
=
`
${
FIXTURES_PATH
}
/
static/
images/green_box.png`
;
export
const
RED_BOX_IMAGE_URL
=
`
${
FIXTURES_PATH
}
/images/red_box.png`
;
export
const
RED_BOX_IMAGE_URL
=
`
${
FIXTURES_PATH
}
/
static/
images/red_box.png`
;
spec/javascripts/vue_shared/components/project_selector/project_list_item_spec.js
View file @
d152a74c
...
@@ -9,8 +9,8 @@ describe('ProjectListItem component', () => {
...
@@ -9,8 +9,8 @@ describe('ProjectListItem component', () => {
let
wrapper
;
let
wrapper
;
let
vm
;
let
vm
;
let
options
;
let
options
;
loadJSONFixtures
(
'
projects.json
'
);
loadJSONFixtures
(
'
static/
projects.json
'
);
const
project
=
getJSONFixture
(
'
projects.json
'
)[
0
];
const
project
=
getJSONFixture
(
'
static/
projects.json
'
)[
0
];
beforeEach
(()
=>
{
beforeEach
(()
=>
{
options
=
{
options
=
{
...
...
spec/javascripts/vue_shared/components/project_selector/project_selector_spec.js
View file @
d152a74c
...
@@ -8,8 +8,8 @@ import { trimText } from 'spec/helpers/vue_component_helper';
...
@@ -8,8 +8,8 @@ import { trimText } from 'spec/helpers/vue_component_helper';
describe
(
'
ProjectSelector component
'
,
()
=>
{
describe
(
'
ProjectSelector component
'
,
()
=>
{
let
wrapper
;
let
wrapper
;
let
vm
;
let
vm
;
loadJSONFixtures
(
'
projects.json
'
);
loadJSONFixtures
(
'
static/
projects.json
'
);
const
allProjects
=
getJSONFixture
(
'
projects.json
'
);
const
allProjects
=
getJSONFixture
(
'
static/
projects.json
'
);
const
searchResults
=
allProjects
.
slice
(
0
,
5
);
const
searchResults
=
allProjects
.
slice
(
0
,
5
);
let
selected
=
[];
let
selected
=
[];
selected
=
selected
.
concat
(
allProjects
.
slice
(
0
,
3
)).
concat
(
allProjects
.
slice
(
5
,
8
));
selected
=
selected
.
concat
(
allProjects
.
slice
(
0
,
3
)).
concat
(
allProjects
.
slice
(
5
,
8
));
...
...
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