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
b2becf16
Commit
b2becf16
authored
Oct 11, 2021
by
Albert Salim
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Disable eslint on existing getJSONFixture
parent
ed6fc80a
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
34 additions
and
8 deletions
+34
-8
ee/spec/frontend/analytics/cycle_analytics/mock_data.js
ee/spec/frontend/analytics/cycle_analytics/mock_data.js
+2
-0
ee/spec/frontend/analytics/devops_report/devops_adoption/mock_data.js
...tend/analytics/devops_report/devops_adoption/mock_data.js
+5
-5
ee/spec/frontend/related_items_tree/components/create_issue_form_spec.js
...d/related_items_tree/components/create_issue_form_spec.js
+3
-0
ee/spec/frontend/related_items_tree/components/related_items_tree_app_spec.js
...ated_items_tree/components/related_items_tree_app_spec.js
+2
-0
ee/spec/frontend/related_items_tree/store/actions_spec.js
ee/spec/frontend/related_items_tree/store/actions_spec.js
+4
-0
spec/frontend/.eslintrc.yml
spec/frontend/.eslintrc.yml
+0
-1
spec/frontend/content_editor/markdown_processing_examples.js
spec/frontend/content_editor/markdown_processing_examples.js
+2
-0
spec/frontend/cycle_analytics/mock_data.js
spec/frontend/cycle_analytics/mock_data.js
+2
-0
spec/frontend/deprecated_jquery_dropdown_spec.js
spec/frontend/deprecated_jquery_dropdown_spec.js
+3
-0
spec/frontend/filterable_list_spec.js
spec/frontend/filterable_list_spec.js
+2
-0
spec/frontend/projects/projects_filterable_list_spec.js
spec/frontend/projects/projects_filterable_list_spec.js
+2
-0
spec/frontend/test_setup.js
spec/frontend/test_setup.js
+1
-2
spec/frontend/vue_shared/components/project_selector/project_list_item_spec.js
...red/components/project_selector/project_list_item_spec.js
+3
-0
spec/frontend/vue_shared/components/project_selector/project_selector_spec.js
...ared/components/project_selector/project_selector_spec.js
+3
-0
No files found.
ee/spec/frontend/analytics/cycle_analytics/mock_data.js
View file @
b2becf16
/* eslint-disable import/no-deprecated */
import
{
uniq
}
from
'
lodash
'
;
import
tasksByType
from
'
test_fixtures/analytics/charts/type_of_work/tasks_by_type.json
'
;
import
{
...
...
ee/spec/frontend/analytics/devops_report/devops_adoption/mock_data.js
View file @
b2becf16
import
json
from
'
test_fixtures/graphql/analytics/devops_report/devops_adoption/graphql/queries/devops_adoption_enabled_namespaces.query.graphql.json
'
;
import
devopsAdoptionOverviewChartJson
from
'
test_fixtures/graphql/analytics/devops_report/devops_adoption/graphql/queries/devops_adoption_overview_chart.query.graphql.json
'
;
import
devopsAdoptionEnabledNamespacesJson
from
'
test_fixtures/graphql/analytics/devops_report/devops_adoption/graphql/queries/devops_adoption_enabled_namespaces.query.graphql.json
'
;
import
{
DEVOPS_ADOPTION_TABLE_CONFIGURATION
}
from
'
ee/analytics/devops_report/devops_adoption/constants
'
;
import
{
getIdFromGraphQLId
}
from
'
~/graphql_shared/utils
'
;
export
const
namespaceWithSnapotsData
=
getJSONFixture
(
'
graphql/analytics/devops_report/devops_adoption/graphql/queries/devops_adoption_overview_chart.query.graphql.json
'
,
);
export
const
namespaceWithSnapotsData
=
devopsAdoptionOverviewChartJson
;
export
const
devopsAdoptionNamespaceData
=
json
.
data
.
devopsAdoptionEnabledNamespaces
;
export
const
devopsAdoptionNamespaceData
=
devopsAdoptionEnabledNamespacesJson
.
data
.
devopsAdoptionEnabledNamespaces
;
export
const
groupData
=
devopsAdoptionNamespaceData
.
nodes
.
map
((
node
)
=>
{
return
{
...
...
ee/spec/frontend/related_items_tree/components/create_issue_form_spec.js
View file @
b2becf16
...
...
@@ -11,6 +11,8 @@ import {
import
{
shallowMount
,
createLocalVue
}
from
'
@vue/test-utils
'
;
import
Vuex
from
'
vuex
'
;
// eslint-disable-next-line import/no-deprecated
import
{
getJSONFixture
}
from
'
helpers/fixtures
'
;
import
CreateIssueForm
from
'
ee/related_items_tree/components/create_issue_form.vue
'
;
import
createDefaultStore
from
'
ee/related_items_tree/store
'
;
import
ProjectAvatar
from
'
~/vue_shared/components/project_avatar.vue
'
;
...
...
@@ -22,6 +24,7 @@ import {
mockMixedFrequentlyUsedProjects
,
}
from
'
../mock_data
'
;
// eslint-disable-next-line import/no-deprecated
const
mockProjects
=
getJSONFixture
(
'
static/projects.json
'
);
const
localVue
=
createLocalVue
();
...
...
ee/spec/frontend/related_items_tree/components/related_items_tree_app_spec.js
View file @
b2becf16
...
...
@@ -9,12 +9,14 @@ import SlotSwitch from '~/vue_shared/components/slot_switch.vue';
import
RelatedItemsTreeApp
from
'
ee/related_items_tree/components/related_items_tree_app.vue
'
;
import
RelatedItemsTreeHeader
from
'
ee/related_items_tree/components/related_items_tree_header.vue
'
;
import
createDefaultStore
from
'
ee/related_items_tree/store
'
;
// eslint-disable-next-line import/no-deprecated
import
{
getJSONFixture
}
from
'
helpers/fixtures
'
;
import
axios
from
'
~/lib/utils/axios_utils
'
;
import
{
issuableTypesMap
}
from
'
~/related_issues/constants
'
;
import
{
mockInitialConfig
,
mockParentItem
,
mockEpics
,
mockIssues
}
from
'
../mock_data
'
;
// eslint-disable-next-line import/no-deprecated
const
mockProjects
=
getJSONFixture
(
'
static/projects.json
'
);
const
localVue
=
createLocalVue
();
...
...
ee/spec/frontend/related_items_tree/store/actions_spec.js
View file @
b2becf16
import
MockAdapter
from
'
axios-mock-adapter
'
;
// eslint-disable-next-line import/no-deprecated
import
{
getJSONFixture
}
from
'
helpers/fixtures
'
;
import
{
ChildType
,
ChildState
}
from
'
ee/related_items_tree/constants
'
;
import
*
as
actions
from
'
ee/related_items_tree/store/actions
'
;
import
*
as
types
from
'
ee/related_items_tree/store/mutation_types
'
;
...
...
@@ -28,6 +31,7 @@ import {
mockEpic1
,
}
from
'
../mock_data
'
;
// eslint-disable-next-line import/no-deprecated
const
mockProjects
=
getJSONFixture
(
'
static/projects.json
'
);
jest
.
mock
(
'
~/flash
'
);
...
...
spec/frontend/.eslintrc.yml
View file @
b2becf16
...
...
@@ -12,7 +12,6 @@ settings:
jest
:
jestConfigFile
:
'
jest.config.js'
globals
:
getJSONFixture
:
false
loadFixtures
:
false
setFixtures
:
false
rules
:
...
...
spec/frontend/content_editor/markdown_processing_examples.js
View file @
b2becf16
import
fs
from
'
fs
'
;
import
path
from
'
path
'
;
import
jsYaml
from
'
js-yaml
'
;
// eslint-disable-next-line import/no-deprecated
import
{
getJSONFixture
}
from
'
helpers/fixtures
'
;
export
const
loadMarkdownApiResult
=
(
testName
)
=>
{
const
fixturePathPrefix
=
`api/markdown/
${
testName
}
.json`
;
// eslint-disable-next-line import/no-deprecated
const
fixture
=
getJSONFixture
(
fixturePathPrefix
);
return
fixture
.
body
||
fixture
.
html
;
};
...
...
spec/frontend/cycle_analytics/mock_data.js
View file @
b2becf16
/* eslint-disable import/no-deprecated */
import
{
getJSONFixture
}
from
'
helpers/fixtures
'
;
import
{
TEST_HOST
}
from
'
helpers/test_constants
'
;
import
{
...
...
spec/frontend/deprecated_jquery_dropdown_spec.js
View file @
b2becf16
...
...
@@ -3,6 +3,8 @@
import
$
from
'
jquery
'
;
import
initDeprecatedJQueryDropdown
from
'
~/deprecated_jquery_dropdown
'
;
import
'
~/lib/utils/common_utils
'
;
// eslint-disable-next-line import/no-deprecated
import
{
getJSONFixture
}
from
'
helpers/fixtures
'
;
import
{
visitUrl
}
from
'
~/lib/utils/url_utility
'
;
jest
.
mock
(
'
~/lib/utils/url_utility
'
,
()
=>
({
...
...
@@ -66,6 +68,7 @@ describe('deprecatedJQueryDropdown', () => {
loadFixtures
(
'
static/deprecated_jquery_dropdown.html
'
);
test
.
dropdownContainerElement
=
$
(
'
.dropdown.inline
'
);
test
.
$dropdownMenuElement
=
$
(
'
.dropdown-menu
'
,
test
.
dropdownContainerElement
);
// eslint-disable-next-line import/no-deprecated
test
.
projectsData
=
getJSONFixture
(
'
static/projects.json
'
);
});
...
...
spec/frontend/filterable_list_spec.js
View file @
b2becf16
// eslint-disable-next-line import/no-deprecated
import
{
getJSONFixture
,
setHTMLFixture
}
from
'
helpers/fixtures
'
;
import
FilterableList
from
'
~/filterable_list
'
;
...
...
@@ -14,6 +15,7 @@ describe('FilterableList', () => {
</div>
<div class="js-projects-list-holder"></div>
`
);
// eslint-disable-next-line import/no-deprecated
getJSONFixture
(
'
static/projects.json
'
);
form
=
document
.
querySelector
(
'
form#project-filter-form
'
);
filter
=
document
.
querySelector
(
'
.js-projects-list-filter
'
);
...
...
spec/frontend/projects/projects_filterable_list_spec.js
View file @
b2becf16
// eslint-disable-next-line import/no-deprecated
import
{
getJSONFixture
,
setHTMLFixture
}
from
'
helpers/fixtures
'
;
import
ProjectsFilterableList
from
'
~/projects/projects_filterable_list
'
;
...
...
@@ -14,6 +15,7 @@ describe('ProjectsFilterableList', () => {
</div>
<div class="js-projects-list-holder"></div>
`
);
// eslint-disable-next-line import/no-deprecated
getJSONFixture
(
'
static/projects.json
'
);
form
=
document
.
querySelector
(
'
form#project-filter-form
'
);
filter
=
document
.
querySelector
(
'
.js-projects-list-filter
'
);
...
...
spec/frontend/test_setup.js
View file @
b2becf16
...
...
@@ -6,7 +6,7 @@ import { setGlobalDateToFakeDate } from 'helpers/fake_date';
import
setWindowLocation
from
'
helpers/set_window_location_helper
'
;
import
{
TEST_HOST
}
from
'
helpers/test_constants
'
;
import
Translate
from
'
~/vue_shared/translate
'
;
import
{
getJSONFixture
,
loadHTMLFixture
,
setHTMLFixture
}
from
'
./__helpers__/fixtures
'
;
import
{
loadHTMLFixture
,
setHTMLFixture
}
from
'
./__helpers__/fixtures
'
;
import
{
initializeTestTimeout
}
from
'
./__helpers__/timeout
'
;
import
customMatchers
from
'
./matchers
'
;
import
{
setupManualMocks
}
from
'
./mocks/mocks_helper
'
;
...
...
@@ -43,7 +43,6 @@ Vue.use(Translate);
// convenience wrapper for migration from Karma
Object
.
assign
(
global
,
{
getJSONFixture
,
loadFixtures
:
loadHTMLFixture
,
setFixtures
:
setHTMLFixture
,
});
...
...
spec/frontend/vue_shared/components/project_selector/project_list_item_spec.js
View file @
b2becf16
import
{
shallowMount
,
createLocalVue
}
from
'
@vue/test-utils
'
;
// eslint-disable-next-line import/no-deprecated
import
{
getJSONFixture
}
from
'
helpers/fixtures
'
;
import
{
trimText
}
from
'
helpers/text_helper
'
;
import
ProjectAvatar
from
'
~/vue_shared/components/deprecated_project_avatar/default.vue
'
;
import
ProjectListItem
from
'
~/vue_shared/components/project_selector/project_list_item.vue
'
;
...
...
@@ -11,6 +13,7 @@ describe('ProjectListItem component', () => {
let
vm
;
let
options
;
// eslint-disable-next-line import/no-deprecated
const
project
=
getJSONFixture
(
'
static/projects.json
'
)[
0
];
beforeEach
(()
=>
{
...
...
spec/frontend/vue_shared/components/project_selector/project_selector_spec.js
View file @
b2becf16
...
...
@@ -2,6 +2,8 @@ import { GlSearchBoxByType, GlInfiniteScroll } from '@gitlab/ui';
import
{
mount
,
createLocalVue
}
from
'
@vue/test-utils
'
;
import
{
head
}
from
'
lodash
'
;
import
Vue
from
'
vue
'
;
// eslint-disable-next-line import/no-deprecated
import
{
getJSONFixture
}
from
'
helpers/fixtures
'
;
import
{
trimText
}
from
'
helpers/text_helper
'
;
import
ProjectListItem
from
'
~/vue_shared/components/project_selector/project_list_item.vue
'
;
import
ProjectSelector
from
'
~/vue_shared/components/project_selector/project_selector.vue
'
;
...
...
@@ -11,6 +13,7 @@ const localVue = createLocalVue();
describe
(
'
ProjectSelector component
'
,
()
=>
{
let
wrapper
;
let
vm
;
// eslint-disable-next-line import/no-deprecated
const
allProjects
=
getJSONFixture
(
'
static/projects.json
'
);
const
searchResults
=
allProjects
.
slice
(
0
,
5
);
let
selected
=
[];
...
...
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