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
9739e45a
Commit
9739e45a
authored
Nov 16, 2018
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix broken karma specs
parent
47774152
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
6 deletions
+13
-6
spec/javascripts/performance_bar/components/detailed_metric_spec.js
...cripts/performance_bar/components/detailed_metric_spec.js
+1
-1
spec/javascripts/vue_mr_widget/components/mr_widget_rebase_spec.js
...scripts/vue_mr_widget/components/mr_widget_rebase_spec.js
+5
-2
spec/javascripts/vue_mr_widget/components/states/mr_widget_missing_branch_spec.js
...widget/components/states/mr_widget_missing_branch_spec.js
+1
-1
spec/javascripts/vue_mr_widget/components/states/mr_widget_nothing_to_merge_spec.js
...dget/components/states/mr_widget_nothing_to_merge_spec.js
+3
-1
spec/javascripts/vue_mr_widget/components/states/mr_widget_wip_spec.js
...pts/vue_mr_widget/components/states/mr_widget_wip_spec.js
+3
-1
No files found.
spec/javascripts/performance_bar/components/detailed_metric_spec.js
View file @
9739e45a
...
@@ -67,7 +67,7 @@ describe('detailedMetric', () => {
...
@@ -67,7 +67,7 @@ describe('detailedMetric', () => {
vm
.
$el
vm
.
$el
.
querySelectorAll
(
'
.performance-bar-modal td:nth-child(3)
'
)
.
querySelectorAll
(
'
.performance-bar-modal td:nth-child(3)
'
)
.
forEach
((
request
,
index
)
=>
{
.
forEach
((
request
,
index
)
=>
{
expect
(
request
.
innerText
).
to
Contain
(
requestDetails
[
index
].
request
);
expect
(
request
.
innerText
).
to
Equal
(
requestDetails
[
index
].
request
);
});
});
});
});
...
...
spec/javascripts/vue_mr_widget/components/mr_widget_rebase_spec.js
View file @
9739e45a
...
@@ -44,7 +44,10 @@ describe('Merge request widget rebase component', () => {
...
@@ -44,7 +44,10 @@ describe('Merge request widget rebase component', () => {
.
textContent
.
trim
();
.
textContent
.
trim
();
expect
(
text
).
toContain
(
'
Fast-forward merge is not possible.
'
);
expect
(
text
).
toContain
(
'
Fast-forward merge is not possible.
'
);
expect
(
text
).
toContain
(
'
Rebase the source branch onto the target branch or merge target
'
);
expect
(
text
.
replace
(
/
\s\s
+/g
,
'
'
)).
toContain
(
'
Rebase the source branch onto the target branch or merge target
'
,
);
expect
(
text
).
toContain
(
'
branch into source branch to allow this merge request to be merged.
'
);
expect
(
text
).
toContain
(
'
branch into source branch to allow this merge request to be merged.
'
);
});
});
...
@@ -78,7 +81,7 @@ describe('Merge request widget rebase component', () => {
...
@@ -78,7 +81,7 @@ describe('Merge request widget rebase component', () => {
expect
(
text
).
toContain
(
'
Fast-forward merge is not possible.
'
);
expect
(
text
).
toContain
(
'
Fast-forward merge is not possible.
'
);
expect
(
text
).
toContain
(
'
Rebase the source branch onto
'
);
expect
(
text
).
toContain
(
'
Rebase the source branch onto
'
);
expect
(
text
).
toContain
(
'
foo
'
);
expect
(
text
).
toContain
(
'
foo
'
);
expect
(
text
).
toContain
(
'
to allow this merge request to be merged.
'
);
expect
(
text
.
replace
(
/
\s\s
+/g
,
'
'
)
).
toContain
(
'
to allow this merge request to be merged.
'
);
});
});
});
});
...
...
spec/javascripts/vue_mr_widget/components/states/mr_widget_missing_branch_spec.js
View file @
9739e45a
...
@@ -33,7 +33,7 @@ describe('MRWidgetMissingBranch', () => {
...
@@ -33,7 +33,7 @@ describe('MRWidgetMissingBranch', () => {
expect
(
el
.
classList
.
contains
(
'
mr-widget-body
'
)).
toBeTruthy
();
expect
(
el
.
classList
.
contains
(
'
mr-widget-body
'
)).
toBeTruthy
();
expect
(
el
.
querySelector
(
'
button
'
).
getAttribute
(
'
disabled
'
)).
toBeTruthy
();
expect
(
el
.
querySelector
(
'
button
'
).
getAttribute
(
'
disabled
'
)).
toBeTruthy
();
expect
(
content
).
toContain
(
'
source branch does not exist.
'
);
expect
(
content
.
replace
(
/
\s\s
+/g
,
'
'
)
).
toContain
(
'
source branch does not exist.
'
);
expect
(
content
).
toContain
(
'
Please restore it or use a different source branch
'
);
expect
(
content
).
toContain
(
'
Please restore it or use a different source branch
'
);
});
});
});
});
...
...
spec/javascripts/vue_mr_widget/components/states/mr_widget_nothing_to_merge_spec.js
View file @
9739e45a
...
@@ -19,7 +19,9 @@ describe('NothingToMerge', () => {
...
@@ -19,7 +19,9 @@ describe('NothingToMerge', () => {
"
Currently there are no changes in this merge request's source branch
"
,
"
Currently there are no changes in this merge request's source branch
"
,
);
);
expect
(
vm
.
$el
.
innerText
).
toContain
(
'
Please push new commits or use a different branch.
'
);
expect
(
vm
.
$el
.
innerText
.
replace
(
/
\s\s
+/g
,
'
'
)).
toContain
(
'
Please push new commits or use a different branch.
'
,
);
});
});
it
(
'
should not show new blob link if there is no link available
'
,
()
=>
{
it
(
'
should not show new blob link if there is no link available
'
,
()
=>
{
...
...
spec/javascripts/vue_mr_widget/components/states/mr_widget_wip_spec.js
View file @
9739e45a
...
@@ -85,7 +85,9 @@ describe('Wip', () => {
...
@@ -85,7 +85,9 @@ describe('Wip', () => {
expect
(
el
.
innerText
).
toContain
(
'
This is a Work in Progress
'
);
expect
(
el
.
innerText
).
toContain
(
'
This is a Work in Progress
'
);
expect
(
el
.
querySelector
(
'
button
'
).
getAttribute
(
'
disabled
'
)).
toBeTruthy
();
expect
(
el
.
querySelector
(
'
button
'
).
getAttribute
(
'
disabled
'
)).
toBeTruthy
();
expect
(
el
.
querySelector
(
'
button
'
).
innerText
).
toContain
(
'
Merge
'
);
expect
(
el
.
querySelector
(
'
button
'
).
innerText
).
toContain
(
'
Merge
'
);
expect
(
el
.
querySelector
(
'
.js-remove-wip
'
).
innerText
).
toContain
(
'
Resolve WIP status
'
);
expect
(
el
.
querySelector
(
'
.js-remove-wip
'
).
innerText
.
replace
(
/
\s\s
+/g
,
'
'
)).
toContain
(
'
Resolve WIP status
'
,
);
});
});
it
(
'
should not show removeWIP button is user cannot update MR
'
,
done
=>
{
it
(
'
should not show removeWIP button is user cannot update MR
'
,
done
=>
{
...
...
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