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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
ecd5d340
Commit
ecd5d340
authored
Aug 01, 2017
by
Luke "Jared" Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed repo_commit_section_spec
parent
47798738
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
19 deletions
+7
-19
spec/javascripts/repo/repo_commit_section_spec.js
spec/javascripts/repo/repo_commit_section_spec.js
+7
-19
No files found.
spec/javascripts/repo/repo_commit_section_spec.js
View file @
ecd5d340
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
repoCommitSection
from
'
~/repo/repo_commit_section.vue
'
;
import
repoCommitSection
from
'
~/repo/repo_commit_section.vue
'
;
import
RepoStore
from
'
~/repo/repo_store
'
;
import
RepoStore
from
'
~/repo/repo_store
'
;
import
RepoHelper
from
'
~/repo/repo_helper
'
;
import
Api
from
'
~/api
'
;
import
Api
from
'
~/api
'
;
describe
(
'
RepoCommitSection
'
,
()
=>
{
describe
(
'
RepoCommitSection
'
,
()
=>
{
const
openedFiles
=
[{
const
openedFiles
=
[{
id
:
0
,
id
:
0
,
changed
:
true
,
changed
:
true
,
url
:
'
url0
'
,
url
:
'
master/
url0
'
,
newContent
:
'
a
'
,
newContent
:
'
a
'
,
},
{
},
{
id
:
1
,
id
:
1
,
changed
:
true
,
changed
:
true
,
url
:
'
url1
'
,
url
:
'
master/
url1
'
,
newContent
:
'
b
'
,
newContent
:
'
b
'
,
},
{
},
{
id
:
2
,
id
:
2
,
changed
:
false
,
changed
:
false
,
}];
}];
const
branch
=
'
master
'
;
function
createComponent
()
{
function
createComponent
()
{
const
RepoCommitSection
=
Vue
.
extend
(
repoCommitSection
);
const
RepoCommitSection
=
Vue
.
extend
(
repoCommitSection
);
...
@@ -28,14 +30,11 @@ describe('RepoCommitSection', () => {
...
@@ -28,14 +30,11 @@ describe('RepoCommitSection', () => {
it
(
'
renders a commit section
'
,
()
=>
{
it
(
'
renders a commit section
'
,
()
=>
{
RepoStore
.
isCommitable
=
true
;
RepoStore
.
isCommitable
=
true
;
RepoStore
.
openedFiles
=
openedFiles
;
RepoStore
.
openedFiles
=
openedFiles
;
spyOn
(
RepoHelper
,
'
getBranch
'
).
and
.
returnValue
(
branch
);
const
vm
=
createComponent
();
const
vm
=
createComponent
();
const
changedFiles
=
[...
vm
.
$el
.
querySelectorAll
(
'
.changed-files > li
'
)];
const
changedFiles
=
[...
vm
.
$el
.
querySelectorAll
(
'
.changed-files > li
'
)];
const
branchDropdownItems
=
[...
vm
.
$el
.
querySelectorAll
(
'
.branch-dropdown .dropdown-menu > li
'
)];
const
commitMessage
=
vm
.
$el
.
querySelector
(
'
#commit-message
'
);
const
commitMessage
=
vm
.
$el
.
querySelector
(
'
#commit-message
'
);
const
targetBranch
=
vm
.
$el
.
querySelector
(
'
#target-branch
'
);
const
newMergeRequest
=
vm
.
$el
.
querySelector
(
'
.new-merge-request
'
);
const
newMergeRequestCheckbox
=
newMergeRequest
.
querySelector
(
'
input
'
);
const
submitCommit
=
vm
.
$el
.
querySelector
(
'
.submit-commit
'
);
const
submitCommit
=
vm
.
$el
.
querySelector
(
'
.submit-commit
'
);
expect
(
vm
.
$el
.
querySelector
(
'
:scope > form
'
)).
toBeTruthy
();
expect
(
vm
.
$el
.
querySelector
(
'
:scope > form
'
)).
toBeTruthy
();
...
@@ -43,25 +42,14 @@ describe('RepoCommitSection', () => {
...
@@ -43,25 +42,14 @@ describe('RepoCommitSection', () => {
expect
(
changedFiles
.
length
).
toEqual
(
2
);
expect
(
changedFiles
.
length
).
toEqual
(
2
);
changedFiles
.
forEach
((
changedFile
,
i
)
=>
{
changedFiles
.
forEach
((
changedFile
,
i
)
=>
{
expect
(
changedFile
.
textContent
).
toEqual
(
openedFiles
[
i
].
url
);
expect
(
changedFile
.
textContent
).
toEqual
(
RepoHelper
.
getFilePathFromFullPath
(
openedFiles
[
i
].
url
,
branch
)
);
});
});
expect
(
commitMessage
.
tagName
).
toEqual
(
'
TEXTAREA
'
);
expect
(
commitMessage
.
tagName
).
toEqual
(
'
TEXTAREA
'
);
expect
(
commitMessage
.
name
).
toEqual
(
'
commit-message
'
);
expect
(
commitMessage
.
name
).
toEqual
(
'
commit-message
'
);
expect
(
branchDropdownItems
[
0
].
textContent
).
toEqual
(
'
Target branch
'
);
expect
(
branchDropdownItems
[
1
].
textContent
).
toEqual
(
'
Create my own branch
'
);
expect
(
targetBranch
.
tagName
).
toEqual
(
'
INPUT
'
);
expect
(
targetBranch
.
name
).
toEqual
(
'
target-branch
'
);
expect
(
targetBranch
.
type
).
toEqual
(
'
text
'
);
expect
(
newMergeRequest
.
textContent
).
toMatch
(
'
Start a new merge request with these changes
'
);
expect
(
newMergeRequestCheckbox
.
type
).
toEqual
(
'
checkbox
'
);
expect
(
newMergeRequestCheckbox
.
id
).
toEqual
(
'
checkboxes-0
'
);
expect
(
newMergeRequestCheckbox
.
name
).
toEqual
(
'
checkboxes
'
);
expect
(
newMergeRequestCheckbox
.
value
).
toEqual
(
'
1
'
);
expect
(
newMergeRequestCheckbox
.
checked
).
toBeFalsy
();
expect
(
submitCommit
.
type
).
toEqual
(
'
submit
'
);
expect
(
submitCommit
.
type
).
toEqual
(
'
submit
'
);
expect
(
submitCommit
.
disabled
).
toBeTruthy
();
expect
(
submitCommit
.
disabled
).
toBeTruthy
();
expect
(
vm
.
$el
.
querySelector
(
'
.commit-summary
'
).
textContent
).
toEqual
(
'
Commit 2
F
iles
'
);
expect
(
vm
.
$el
.
querySelector
(
'
.commit-summary
'
).
textContent
).
toEqual
(
'
Commit 2
f
iles
'
);
});
});
it
(
'
does not render if not isCommitable
'
,
()
=>
{
it
(
'
does not render if not isCommitable
'
,
()
=>
{
...
...
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