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
5d207fe3
Commit
5d207fe3
authored
Jan 20, 2022
by
Illya Klymov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace usage of find/findAll in misc ee components (4/5)
* migrate to proper use of findComponent/findAllComponents
parent
68755b38
Changes
17
Show whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
101 additions
and
97 deletions
+101
-97
ee/spec/frontend/oncall_schedule/add_edit_schedule_form_spec.js
...c/frontend/oncall_schedule/add_edit_schedule_form_spec.js
+3
-3
ee/spec/frontend/oncall_schedule/mocks/mock_rotation.json
ee/spec/frontend/oncall_schedule/mocks/mock_rotation.json
+58
-56
ee/spec/frontend/oncall_schedule/oncall_schedule_spec.js
ee/spec/frontend/oncall_schedule/oncall_schedule_spec.js
+3
-3
ee/spec/frontend/oncall_schedule/rotations/components/add_edit_rotation_form_spec.js
...edule/rotations/components/add_edit_rotation_form_spec.js
+2
-2
ee/spec/frontend/oncall_schedule/schedule/components/rotations_list_section_spec.js
...hedule/schedule/components/rotations_list_section_spec.js
+1
-1
ee/spec/frontend/operations/components/dashboard/dashboard_spec.js
...rontend/operations/components/dashboard/dashboard_spec.js
+5
-5
ee/spec/frontend/operations/components/dashboard/project_header_spec.js
...nd/operations/components/dashboard/project_header_spec.js
+2
-2
ee/spec/frontend/operations/components/dashboard/project_spec.js
.../frontend/operations/components/dashboard/project_spec.js
+7
-5
ee/spec/frontend/pages/admin/users/reset_button_spec.js
ee/spec/frontend/pages/admin/users/reset_button_spec.js
+1
-1
ee/spec/frontend/pages/groups/new/components/credit_card_verification_spec.js
...es/groups/new/components/credit_card_verification_spec.js
+1
-1
ee/spec/frontend/pages/groups/saml_providers/saml_members/index_spec.js
...nd/pages/groups/saml_providers/saml_members/index_spec.js
+4
-4
ee/spec/frontend/pending_members/components/app_spec.js
ee/spec/frontend/pending_members/components/app_spec.js
+1
-1
ee/spec/frontend/projects/components/project_adjourned_delete_button_spec.js
...ojects/components/project_adjourned_delete_button_spec.js
+1
-1
ee/spec/frontend/projects/merge_requests/blocking_mr_input_root_spec.js
...nd/projects/merge_requests/blocking_mr_input_root_spec.js
+1
-1
ee/spec/frontend/projects/settings/components/shared_runners_toggle_spec.js
...rojects/settings/components/shared_runners_toggle_spec.js
+1
-1
ee/spec/frontend/registrations/groups_projects/new/components/credit_card_verification_spec.js
..._projects/new/components/credit_card_verification_spec.js
+4
-4
ee/spec/frontend/registrations/verifications/components/verification_spec.js
...gistrations/verifications/components/verification_spec.js
+6
-6
No files found.
ee/spec/frontend/oncall_schedule/add_edit_schedule_form_spec.js
View file @
5d207fe3
...
...
@@ -45,10 +45,10 @@ describe('AddEditScheduleForm', () => {
wrapper
.
destroy
();
});
const
findTimezoneDropdown
=
()
=>
wrapper
.
find
(
GlDropdown
);
const
findTimezoneDropdown
=
()
=>
wrapper
.
find
Component
(
GlDropdown
);
const
findDropdownOptions
=
()
=>
wrapper
.
findAllComponents
(
GlDropdownItem
);
const
findTimezoneSearchBox
=
()
=>
wrapper
.
find
(
GlSearchBoxByType
);
const
findScheduleName
=
()
=>
wrapper
.
find
(
GlFormGroup
);
const
findTimezoneSearchBox
=
()
=>
wrapper
.
find
Component
(
GlSearchBoxByType
);
const
findScheduleName
=
()
=>
wrapper
.
find
Component
(
GlFormGroup
);
it
(
'
renders form layout
'
,
()
=>
{
createComponent
({
...
...
ee/spec/frontend/oncall_schedule/mocks/mock_rotation.json
View file @
5d207fe3
[{
[
{
"id"
:
"gid://gitlab/IncidentManagement::OncallRotation/2"
,
"name"
:
"Rotation 242"
,
"startsAt"
:
"2021-01-13T11:04:56.333Z"
,
...
...
@@ -180,8 +181,8 @@
}
]
}
},
{
},
{
"id"
:
"gid://gitlab/IncidentManagement::OncallRotation/5"
,
"name"
:
"Rotation 247"
,
"startsAt"
:
"2021-01-06T10:04:56.333Z"
,
...
...
@@ -241,4 +242,5 @@
}
]
}
}]
}
]
ee/spec/frontend/oncall_schedule/oncall_schedule_spec.js
View file @
5d207fe3
...
...
@@ -96,9 +96,9 @@ describe('On-call schedule', () => {
const
findScheduleDescription
=
()
=>
findSchedule
().
text
();
const
findRotations
=
()
=>
wrapper
.
findByTestId
(
'
rotationsBody
'
);
const
findRotationsShiftPreset
=
()
=>
wrapper
.
findByTestId
(
'
shift-preset-change
'
);
const
findAddRotationsBtn
=
()
=>
findRotationsHeader
().
find
(
GlButton
);
const
findScheduleTimeline
=
()
=>
findRotations
().
find
(
ScheduleTimelineSection
);
const
findRotationsList
=
()
=>
findRotations
().
find
(
RotationsListSection
);
const
findAddRotationsBtn
=
()
=>
findRotationsHeader
().
find
Component
(
GlButton
);
const
findScheduleTimeline
=
()
=>
findRotations
().
find
Component
(
ScheduleTimelineSection
);
const
findRotationsList
=
()
=>
findRotations
().
find
Component
(
RotationsListSection
);
const
findLoadPreviousTimeframeBtn
=
()
=>
wrapper
.
findByTestId
(
'
previous-timeframe-btn
'
);
const
findLoadNextTimeframeBtn
=
()
=>
wrapper
.
findByTestId
(
'
next-timeframe-btn
'
);
const
findCollapsible
=
()
=>
wrapper
.
findComponent
(
GlCollapse
);
...
...
ee/spec/frontend/oncall_schedule/rotations/components/add_edit_rotation_form_spec.js
View file @
5d207fe3
...
...
@@ -49,9 +49,9 @@ describe('AddEditRotationForm', () => {
const
findRotationLength
=
()
=>
wrapper
.
find
(
'
[id="rotation-length"]
'
);
const
findRotationStartTime
=
()
=>
wrapper
.
find
(
'
[data-testid="rotation-start-time"]
'
);
const
findRotationEndsContainer
=
()
=>
wrapper
.
find
(
'
[data-testid="rotation-ends-on"]
'
);
const
findEndDateToggle
=
()
=>
wrapper
.
find
(
GlToggle
);
const
findEndDateToggle
=
()
=>
wrapper
.
find
Component
(
GlToggle
);
const
findRotationEndTime
=
()
=>
wrapper
.
find
(
'
[data-testid="rotation-end-time"]
'
);
const
findUserSelector
=
()
=>
wrapper
.
find
(
GlTokenSelector
);
const
findUserSelector
=
()
=>
wrapper
.
find
Component
(
GlTokenSelector
);
const
findRotationFormGroups
=
()
=>
wrapper
.
findAllComponents
(
GlFormGroup
);
const
findStartsOnTimeOptions
=
()
=>
findRotationStartTime
().
findAllComponents
(
GlDropdownItem
);
const
findEndsOnTimeOptions
=
()
=>
findRotationEndTime
().
findAllComponents
(
GlDropdownItem
);
...
...
ee/spec/frontend/oncall_schedule/schedule/components/rotations_list_section_spec.js
View file @
5d207fe3
...
...
@@ -77,7 +77,7 @@ describe('RotationsListSectionComponent', () => {
});
it
(
'
renders current day indicator in the first timeline cell
'
,
()
=>
{
expect
(
findTimelineCells
().
at
(
0
).
find
(
CurrentDayIndicator
).
exists
()).
toBe
(
true
);
expect
(
findTimelineCells
().
at
(
0
).
find
Component
(
CurrentDayIndicator
).
exists
()).
toBe
(
true
);
});
it
(
'
render the correct amount of rotation assignees with their related information
'
,
()
=>
{
...
...
ee/spec/frontend/operations/components/dashboard/dashboard_spec.js
View file @
5d207fe3
...
...
@@ -36,7 +36,7 @@ describe('dashboard component', () => {
stubs
,
});
const
findEmptyState
=
()
=>
wrapper
.
find
(
GlEmptyState
);
const
findEmptyState
=
()
=>
wrapper
.
find
Component
(
GlEmptyState
);
const
findAddProjectButton
=
()
=>
wrapper
.
find
(
'
[data-testid=add-projects-button]
'
);
beforeEach
(()
=>
{
...
...
@@ -85,7 +85,7 @@ describe('dashboard component', () => {
.
then
(
waitForPromises
)
.
then
(()
=>
{
expect
(
store
.
state
.
projects
.
length
).
toEqual
(
2
);
expect
(
wrapper
.
findAll
(
Project
).
length
).
toEqual
(
2
);
expect
(
wrapper
.
findAll
Components
(
Project
).
length
).
toEqual
(
2
);
});
});
});
...
...
@@ -102,14 +102,14 @@ describe('dashboard component', () => {
});
it
(
'
includes a dashboard project component for each project
'
,
()
=>
{
const
projectComponents
=
wrapper
.
findAll
(
Project
);
const
projectComponents
=
wrapper
.
findAll
Components
(
Project
);
expect
(
projectComponents
).
toHaveLength
(
projectCount
);
});
it
(
'
passes each project to the dashboard project component
'
,
()
=>
{
const
[
oneProject
]
=
store
.
state
.
projects
;
const
projectComponent
=
wrapper
.
find
(
Project
);
const
projectComponent
=
wrapper
.
find
Component
(
Project
);
expect
(
projectComponent
.
props
().
project
).
toEqual
(
oneProject
);
});
...
...
@@ -133,7 +133,7 @@ describe('dashboard component', () => {
return
waitForPromises
().
then
(()
=>
{
expect
(
store
.
state
.
projects
.
length
).
toEqual
(
0
);
expect
(
wrapper
.
findAll
(
Project
).
length
).
toEqual
(
0
);
expect
(
wrapper
.
findAll
Components
(
Project
).
length
).
toEqual
(
0
);
});
});
});
...
...
ee/spec/frontend/operations/components/dashboard/project_header_spec.js
View file @
5d207fe3
...
...
@@ -60,11 +60,11 @@ describe('project header component', () => {
describe
(
'
wrapped components
'
,
()
=>
{
describe
(
'
project avatar
'
,
()
=>
{
it
(
'
renders
'
,
()
=>
{
expect
(
wrapper
.
findAll
(
ProjectAvatar
)).
toHaveLength
(
1
);
expect
(
wrapper
.
findAll
Components
(
ProjectAvatar
)).
toHaveLength
(
1
);
});
it
(
'
binds project
'
,
()
=>
{
expect
(
wrapper
.
find
(
ProjectAvatar
).
props
(
'
project
'
)).
toEqual
(
mockOneProject
);
expect
(
wrapper
.
find
Component
(
ProjectAvatar
).
props
(
'
project
'
)).
toEqual
(
mockOneProject
);
});
});
});
...
...
ee/spec/frontend/operations/components/dashboard/project_spec.js
View file @
5d207fe3
...
...
@@ -50,7 +50,7 @@ describe('project component', () => {
});
it
(
'
shows project title
'
,
()
=>
{
const
header
=
wrapper
.
find
(
ProjectHeader
);
const
header
=
wrapper
.
find
Component
(
ProjectHeader
);
expect
(
header
.
props
(
'
project
'
)).
toEqual
(
project
);
});
...
...
@@ -61,7 +61,9 @@ describe('project component', () => {
it
(
'
shows upgrade license text
'
,
()
=>
{
expect
(
findDashboardCard
().
text
()).
toContain
(
'
upgrade its group plan to Premium
'
);
expect
(
findDashboardCard
().
find
(
GlLink
).
attributes
(
'
href
'
)).
toBe
(
project
.
upgrade_path
);
expect
(
findDashboardCard
().
findComponent
(
GlLink
).
attributes
(
'
href
'
)).
toBe
(
project
.
upgrade_path
,
);
});
it
(
'
hides commit info
'
,
()
=>
{
...
...
@@ -96,7 +98,7 @@ describe('project component', () => {
describe
(
'
project header
'
,
()
=>
{
it
(
'
binds project
'
,
()
=>
{
const
header
=
wrapper
.
find
(
ProjectHeader
);
const
header
=
wrapper
.
find
Component
(
ProjectHeader
);
expect
(
header
.
props
(
'
project
'
)).
toEqual
(
mockOneProject
);
});
...
...
@@ -104,7 +106,7 @@ describe('project component', () => {
describe
(
'
alerts
'
,
()
=>
{
it
(
'
binds alert count to count
'
,
()
=>
{
const
alert
=
wrapper
.
find
(
Alerts
);
const
alert
=
wrapper
.
find
Component
(
Alerts
);
expect
(
alert
.
props
(
'
count
'
)).
toBe
(
mockOneProject
.
alert_count
);
});
...
...
@@ -114,7 +116,7 @@ describe('project component', () => {
let
commit
;
beforeEach
(()
=>
{
commit
=
wrapper
.
find
(
Commit
);
commit
=
wrapper
.
find
Component
(
Commit
);
});
it
(
'
binds commitRef
'
,
()
=>
{
...
...
ee/spec/frontend/pages/admin/users/reset_button_spec.js
View file @
5d207fe3
...
...
@@ -32,7 +32,7 @@ describe('Reset pipeline minutes button', () => {
wrapper
=
null
;
});
const
findResetButton
=
()
=>
wrapper
.
find
(
GlButton
);
const
findResetButton
=
()
=>
wrapper
.
find
Component
(
GlButton
);
it
(
'
should contain a button with the "Reset pipeline minutes" text
'
,
()
=>
{
const
button
=
findResetButton
();
...
...
ee/spec/frontend/pages/groups/new/components/credit_card_verification_spec.js
View file @
5d207fe3
...
...
@@ -66,7 +66,7 @@ describe('Verification page', () => {
.
spyOn
(
wrapper
.
find
(
'
iframe
'
).
element
.
contentWindow
,
'
postMessage
'
)
.
mockImplementation
(
dispatchWindowMessageEvent
);
wrapper
.
find
(
GlButton
).
vm
.
$emit
(
'
click
'
);
wrapper
.
find
Component
(
GlButton
).
vm
.
$emit
(
'
click
'
);
});
it
(
'
triggers postMessage on the Zuora iframe
'
,
()
=>
{
...
...
ee/spec/frontend/pages/groups/saml_providers/saml_members/index_spec.js
View file @
5d207fe3
...
...
@@ -48,7 +48,7 @@ describe('SAML providers members app', () => {
});
it
(
'
renders loader
'
,
()
=>
{
expect
(
wrapper
.
find
(
GlSkeletonLoading
).
exists
()).
toBe
(
true
);
expect
(
wrapper
.
find
Component
(
GlSkeletonLoading
).
exists
()).
toBe
(
true
);
});
});
...
...
@@ -60,15 +60,15 @@ describe('SAML providers members app', () => {
});
it
(
'
does not render loader
'
,
()
=>
{
expect
(
wrapper
.
find
(
GlSkeletonLoading
).
exists
()).
toBe
(
false
);
expect
(
wrapper
.
find
Component
(
GlSkeletonLoading
).
exists
()).
toBe
(
false
);
});
it
(
'
renders table
'
,
()
=>
{
expect
(
wrapper
.
find
(
GlTable
).
exists
()).
toBe
(
true
);
expect
(
wrapper
.
find
Component
(
GlTable
).
exists
()).
toBe
(
true
);
});
it
(
'
requests next page when pagination component performs change
'
,
()
=>
{
const
changeFn
=
wrapper
.
find
(
TablePagination
).
props
(
'
change
'
);
const
changeFn
=
wrapper
.
find
Component
(
TablePagination
).
props
(
'
change
'
);
changeFn
(
2
);
return
wrapper
.
vm
.
$nextTick
(()
=>
{
expect
(
fetchPageMock
).
toHaveBeenCalledWith
(
expect
.
anything
(),
2
);
...
...
ee/spec/frontend/pending_members/components/app_spec.js
View file @
5d207fe3
...
...
@@ -82,6 +82,6 @@ describe('PendingMembersApp', () => {
initialGetters
:
{
tableItems
:
()
=>
[
mockInvitedApprovedMember
]
},
initialState
:
{
members
:
[
mockInvitedApprovedMember
]
},
});
expect
(
wrapper
.
find
(
GlBadge
).
text
()).
toEqual
(
'
Awaiting member signup
'
);
expect
(
wrapper
.
find
Component
(
GlBadge
).
text
()).
toEqual
(
'
Awaiting member signup
'
);
});
});
ee/spec/frontend/projects/components/project_adjourned_delete_button_spec.js
View file @
5d207fe3
...
...
@@ -8,7 +8,7 @@ jest.mock('lodash/uniqueId', () => () => 'fakeUniqueId');
describe
(
'
Project remove modal
'
,
()
=>
{
let
wrapper
;
const
findSharedDeleteButton
=
()
=>
wrapper
.
find
(
SharedDeleteButton
);
const
findSharedDeleteButton
=
()
=>
wrapper
.
find
Component
(
SharedDeleteButton
);
const
defaultProps
=
{
adjournedRemovalDate
:
'
2020-12-12
'
,
...
...
ee/spec/frontend/projects/merge_requests/blocking_mr_input_root_spec.js
View file @
5d207fe3
...
...
@@ -5,7 +5,7 @@ import RelatedIssuableInput from '~/related_issues/components/related_issuable_i
describe
(
'
blocking mr input root
'
,
()
=>
{
let
wrapper
;
const
getInput
=
()
=>
wrapper
.
find
(
RelatedIssuableInput
);
const
getInput
=
()
=>
wrapper
.
find
Component
(
RelatedIssuableInput
);
const
addTokenizedInput
=
(
input
)
=>
{
getInput
().
vm
.
$emit
(
'
addIssuableFormInput
'
,
{
untouchedRawReferences
:
[
input
],
...
...
ee/spec/frontend/projects/settings/components/shared_runners_toggle_spec.js
View file @
5d207fe3
...
...
@@ -26,7 +26,7 @@ describe('projects/settings/components/shared_runners', () => {
});
};
const
findSharedRunnersToggle
=
()
=>
wrapper
.
find
(
GlToggle
);
const
findSharedRunnersToggle
=
()
=>
wrapper
.
find
Component
(
GlToggle
);
const
findCcValidationRequiredAlert
=
()
=>
wrapper
.
findComponent
(
CcValidationRequiredAlert
);
const
getToggleValue
=
()
=>
findSharedRunnersToggle
().
props
(
'
value
'
);
const
isToggleDisabled
=
()
=>
findSharedRunnersToggle
().
props
(
'
disabled
'
);
...
...
ee/spec/frontend/registrations/groups_projects/new/components/credit_card_verification_spec.js
View file @
5d207fe3
...
...
@@ -25,11 +25,11 @@ describe('CreditCardVerification', () => {
};
const
verifyToggleEnabled
=
()
=>
wrapper
.
find
({
ref
:
'
verifyToggle
'
}).
attributes
(
'
enabled
'
)
===
'
true
'
;
wrapper
.
find
Component
({
ref
:
'
verifyToggle
'
}).
attributes
(
'
enabled
'
)
===
'
true
'
;
const
createToggleEnabled
=
()
=>
wrapper
.
find
({
ref
:
'
createToggle
'
}).
attributes
(
'
enabled
'
)
===
'
true
'
;
const
findZuora
=
()
=>
wrapper
.
find
({
ref
:
'
zuora
'
});
const
findSubmitButton
=
()
=>
wrapper
.
find
({
ref
:
'
submitButton
'
});
wrapper
.
find
Component
({
ref
:
'
createToggle
'
}).
attributes
(
'
enabled
'
)
===
'
true
'
;
const
findZuora
=
()
=>
wrapper
.
find
Component
({
ref
:
'
zuora
'
});
const
findSubmitButton
=
()
=>
wrapper
.
find
Component
({
ref
:
'
submitButton
'
});
const
toggleContainerHidden
=
()
=>
document
.
querySelector
(
'
.js-toggle-container
'
).
classList
.
contains
(
'
gl-display-none
'
);
...
...
ee/spec/frontend/registrations/verifications/components/verification_spec.js
View file @
5d207fe3
...
...
@@ -34,12 +34,12 @@ describe('Verification', () => {
});
};
const
findSubmitButton
=
()
=>
wrapper
.
find
({
ref
:
'
submitButton
'
});
const
findZuora
=
()
=>
wrapper
.
find
({
ref
:
'
zuora
'
});
const
findSkipLink
=
()
=>
wrapper
.
find
({
ref
:
'
skipLink
'
});
const
findPopover
=
()
=>
wrapper
.
find
({
ref
:
'
popover
'
});
const
findPopoverClose
=
()
=>
wrapper
.
find
({
ref
:
'
popoverClose
'
});
const
findSkipConfirmationLink
=
()
=>
wrapper
.
find
({
ref
:
'
skipConfirmationLink
'
});
const
findSubmitButton
=
()
=>
wrapper
.
find
Component
({
ref
:
'
submitButton
'
});
const
findZuora
=
()
=>
wrapper
.
find
Component
({
ref
:
'
zuora
'
});
const
findSkipLink
=
()
=>
wrapper
.
find
Component
({
ref
:
'
skipLink
'
});
const
findPopover
=
()
=>
wrapper
.
find
Component
({
ref
:
'
popover
'
});
const
findPopoverClose
=
()
=>
wrapper
.
find
Component
({
ref
:
'
popoverClose
'
});
const
findSkipConfirmationLink
=
()
=>
wrapper
.
find
Component
({
ref
:
'
skipConfirmationLink
'
});
const
expectRedirect
=
()
=>
expect
(
redirectTo
).
toHaveBeenCalledWith
(
NEXT_STEP_URL
);
const
expectTrackingOfEvent
=
(
event
)
=>
{
...
...
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