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
82ddf2dc
Commit
82ddf2dc
authored
Mar 01, 2022
by
Paul Gascou-Vaillancourt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Extend inner wrappers
Leverage extendedWrapper to extend inner Wrapper instances.
parent
77851e6c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
spec/frontend/merge_conflicts/components/merge_conflict_resolver_app_spec.js
..._conflicts/components/merge_conflict_resolver_app_spec.js
+5
-4
No files found.
spec/frontend/merge_conflicts/components/merge_conflict_resolver_app_spec.js
View file @
82ddf2dc
import
{
GlSprintf
}
from
'
@gitlab/ui
'
;
import
Vue
,
{
nextTick
}
from
'
vue
'
;
import
Vuex
from
'
vuex
'
;
import
{
shallowMountExtended
}
from
'
helpers/vue_test_utils_helper
'
;
import
{
shallowMountExtended
,
extendedWrapper
}
from
'
helpers/vue_test_utils_helper
'
;
import
InlineConflictLines
from
'
~/merge_conflicts/components/inline_conflict_lines.vue
'
;
import
ParallelConflictLines
from
'
~/merge_conflicts/components/parallel_conflict_lines.vue
'
;
import
component
from
'
~/merge_conflicts/merge_conflict_resolver_app.vue
'
;
...
...
@@ -44,9 +44,10 @@ describe('Merge Conflict Resolver App', () => {
const
findLoadingSpinner
=
()
=>
wrapper
.
findByTestId
(
'
loading-spinner
'
);
const
findConflictsCount
=
()
=>
wrapper
.
findByTestId
(
'
conflicts-count
'
);
const
findFiles
=
()
=>
wrapper
.
findAllByTestId
(
'
files
'
);
const
findFileHeader
=
(
w
=
wrapper
)
=>
w
.
find
(
'
[data-testid="file-name"]
'
);
const
findFileInteractiveButton
=
(
w
=
wrapper
)
=>
w
.
find
(
'
[data-testid="interactive-button"]
'
);
const
findFileInlineButton
=
(
w
=
wrapper
)
=>
w
.
find
(
'
[data-testid="inline-button"]
'
);
const
findFileHeader
=
(
w
=
wrapper
)
=>
extendedWrapper
(
w
).
findByTestId
(
'
file-name
'
);
const
findFileInteractiveButton
=
(
w
=
wrapper
)
=>
extendedWrapper
(
w
).
findByTestId
(
'
interactive-button
'
);
const
findFileInlineButton
=
(
w
=
wrapper
)
=>
extendedWrapper
(
w
).
findByTestId
(
'
inline-button
'
);
const
findSideBySideButton
=
()
=>
wrapper
.
findByTestId
(
'
side-by-side
'
);
const
findInlineConflictLines
=
(
w
=
wrapper
)
=>
w
.
find
(
InlineConflictLines
);
const
findParallelConflictLines
=
(
w
=
wrapper
)
=>
w
.
find
(
ParallelConflictLines
);
...
...
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