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
b328218a
Commit
b328218a
authored
Sep 21, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated specs to account for removed buttons
parent
b46ec151
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
65 deletions
+2
-65
spec/features/projects/tree/create_directory_spec.rb
spec/features/projects/tree/create_directory_spec.rb
+1
-1
spec/features/projects/tree/create_file_spec.rb
spec/features/projects/tree/create_file_spec.rb
+1
-1
spec/javascripts/ide/components/commit_sidebar/list_item_spec.js
...vascripts/ide/components/commit_sidebar/list_item_spec.js
+0
-4
spec/javascripts/ide/components/repo_commit_section_spec.js
spec/javascripts/ide/components/repo_commit_section_spec.js
+0
-59
No files found.
spec/features/projects/tree/create_directory_spec.rb
View file @
b328218a
...
...
@@ -43,7 +43,7 @@ describe 'Multi-file editor new directory', :js do
find
(
'.js-ide-commit-mode'
).
click
find
(
'.multi-file-commit-list-item'
).
hover
first
(
'.multi-file-discard-btn .btn'
).
click
click_button
'Stage'
fill_in
(
'commit-message'
,
with:
'commit message ide'
)
...
...
spec/features/projects/tree/create_file_spec.rb
View file @
b328218a
...
...
@@ -35,7 +35,7 @@ describe 'Multi-file editor new file', :js do
find
(
'.js-ide-commit-mode'
).
click
find
(
'.multi-file-commit-list-item'
).
hover
first
(
'.multi-file-discard-btn .btn'
).
click
click_button
'Stage'
fill_in
(
'commit-message'
,
with:
'commit message ide'
)
...
...
spec/javascripts/ide/components/commit_sidebar/list_item_spec.js
View file @
b328218a
...
...
@@ -33,10 +33,6 @@ describe('Multi-file editor commit sidebar list item', () => {
expect
(
vm
.
$el
.
querySelector
(
'
.multi-file-commit-list-path
'
).
textContent
).
toContain
(
f
.
path
);
});
it
(
'
renders actionn button
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.multi-file-discard-btn
'
)).
not
.
toBeNull
();
});
it
(
'
opens a closed file in the editor when clicking the file path
'
,
done
=>
{
spyOn
(
vm
,
'
openPendingTab
'
).
and
.
callThrough
();
spyOn
(
router
,
'
push
'
);
...
...
spec/javascripts/ide/components/repo_commit_section_spec.js
View file @
b328218a
...
...
@@ -103,65 +103,6 @@ describe('RepoCommitSection', () => {
});
});
it
(
'
adds changed files into staged files
'
,
done
=>
{
vm
.
$el
.
querySelector
(
'
.multi-file-discard-btn .btn
'
).
click
();
vm
.
$nextTick
()
.
then
(()
=>
vm
.
$el
.
querySelector
(
'
.multi-file-discard-btn .btn
'
).
click
())
.
then
(
vm
.
$nextTick
)
.
then
(()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.ide-commit-list-container
'
).
textContent
).
toContain
(
'
There are no unstaged changes
'
,
);
})
.
then
(
done
)
.
catch
(
done
.
fail
);
});
it
(
'
stages a single file
'
,
done
=>
{
vm
.
$el
.
querySelector
(
'
.multi-file-discard-btn .btn
'
).
click
();
Vue
.
nextTick
(()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.ide-commit-list-container
'
)
.
querySelectorAll
(
'
.multi-file-commit-list > li
'
).
length
,
).
toBe
(
1
);
done
();
});
});
it
(
'
discards a single file
'
,
done
=>
{
vm
.
$el
.
querySelector
(
'
.multi-file-commit-list li:first-child .js-modal-primary-action
'
).
click
();
Vue
.
nextTick
(()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.ide-commit-list-container
'
).
textContent
).
not
.
toContain
(
'
file1
'
);
expect
(
vm
.
$el
.
querySelector
(
'
.ide-commit-list-container
'
)
.
querySelectorAll
(
'
.multi-file-commit-list > li
'
).
length
,
).
toBe
(
1
);
done
();
});
});
it
(
'
unstages a single file
'
,
done
=>
{
vm
.
$el
.
querySelectorAll
(
'
.multi-file-discard-btn
'
)[
2
]
.
querySelector
(
'
.btn
'
)
.
click
();
Vue
.
nextTick
(()
=>
{
expect
(
vm
.
$el
.
querySelectorAll
(
'
.ide-commit-list-container
'
)[
1
].
querySelectorAll
(
'
li
'
).
length
,
).
toBe
(
1
);
done
();
});
});
describe
(
'
mounted
'
,
()
=>
{
it
(
'
opens last opened file
'
,
()
=>
{
expect
(
store
.
state
.
openFiles
.
length
).
toBe
(
1
);
...
...
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