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
d4fce4dc
Commit
d4fce4dc
authored
Jun 28, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed eslint
parent
fa8c82c7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
19 deletions
+18
-19
app/assets/javascripts/ide/stores/actions/file.js
app/assets/javascripts/ide/stores/actions/file.js
+0
-1
spec/javascripts/ide/components/repo_commit_section_spec.js
spec/javascripts/ide/components/repo_commit_section_spec.js
+0
-1
spec/javascripts/ide/stores/actions/file_spec.js
spec/javascripts/ide/stores/actions/file_spec.js
+18
-17
No files found.
app/assets/javascripts/ide/stores/actions/file.js
View file @
d4fce4dc
import
{
normalizeHeaders
}
from
'
~/lib/utils/common_utils
'
;
import
{
__
}
from
'
../../../locale
'
;
import
{
__
}
from
'
../../../locale
'
;
import
eventHub
from
'
../../eventhub
'
;
import
eventHub
from
'
../../eventhub
'
;
import
service
from
'
../../services
'
;
import
service
from
'
../../services
'
;
...
...
spec/javascripts/ide/components/repo_commit_section_spec.js
View file @
d4fce4dc
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
store
from
'
~/ide/stores
'
;
import
store
from
'
~/ide/stores
'
;
import
service
from
'
~/ide/services
'
;
import
router
from
'
~/ide/ide_router
'
;
import
router
from
'
~/ide/ide_router
'
;
import
repoCommitSection
from
'
~/ide/components/repo_commit_section.vue
'
;
import
repoCommitSection
from
'
~/ide/components/repo_commit_section.vue
'
;
import
{
createComponentWithStore
}
from
'
spec/helpers/vue_mount_component_helper
'
;
import
{
createComponentWithStore
}
from
'
spec/helpers/vue_mount_component_helper
'
;
...
...
spec/javascripts/ide/stores/actions/file_spec.js
View file @
d4fce4dc
...
@@ -2,7 +2,6 @@ import Vue from 'vue';
...
@@ -2,7 +2,6 @@ import Vue from 'vue';
import
MockAdapter
from
'
axios-mock-adapter
'
;
import
MockAdapter
from
'
axios-mock-adapter
'
;
import
axios
from
'
~/lib/utils/axios_utils
'
;
import
axios
from
'
~/lib/utils/axios_utils
'
;
import
store
from
'
~/ide/stores
'
;
import
store
from
'
~/ide/stores
'
;
import
{
getFileData
,
getRawFileData
}
from
'
~/ide/stores/actions/file
'
;
import
*
as
actions
from
'
~/ide/stores/actions/file
'
;
import
*
as
actions
from
'
~/ide/stores/actions/file
'
;
import
*
as
types
from
'
~/ide/stores/mutation_types
'
;
import
*
as
types
from
'
~/ide/stores/mutation_types
'
;
import
service
from
'
~/ide/services
'
;
import
service
from
'
~/ide/services
'
;
...
@@ -293,14 +292,15 @@ describe('IDE store file actions', () => {
...
@@ -293,14 +292,15 @@ describe('IDE store file actions', () => {
it
(
'
dispatches error action
'
,
done
=>
{
it
(
'
dispatches error action
'
,
done
=>
{
const
dispatch
=
jasmine
.
createSpy
(
'
dispatch
'
);
const
dispatch
=
jasmine
.
createSpy
(
'
dispatch
'
);
getFileData
(
actions
{
.
getFileData
(
state
:
store
.
state
,
{
commit
()
{},
state
:
store
.
state
,
dispatch
,
commit
()
{},
},
dispatch
,
{
path
:
localFile
.
path
},
},
)
{
path
:
localFile
.
path
},
)
.
then
(()
=>
{
.
then
(()
=>
{
expect
(
dispatch
).
toHaveBeenCalledWith
(
'
setErrorMessage
'
,
{
expect
(
dispatch
).
toHaveBeenCalledWith
(
'
setErrorMessage
'
,
{
text
:
'
An error occured whilst loading the file.
'
,
text
:
'
An error occured whilst loading the file.
'
,
...
@@ -381,14 +381,15 @@ describe('IDE store file actions', () => {
...
@@ -381,14 +381,15 @@ describe('IDE store file actions', () => {
it
(
'
dispatches error action
'
,
done
=>
{
it
(
'
dispatches error action
'
,
done
=>
{
const
dispatch
=
jasmine
.
createSpy
(
'
dispatch
'
);
const
dispatch
=
jasmine
.
createSpy
(
'
dispatch
'
);
getRawFileData
(
actions
{
.
getRawFileData
(
state
:
store
.
state
,
{
commit
()
{},
state
:
store
.
state
,
dispatch
,
commit
()
{},
},
dispatch
,
{
path
:
tmpFile
.
path
,
baseSha
:
tmpFile
.
baseSha
},
},
)
{
path
:
tmpFile
.
path
,
baseSha
:
tmpFile
.
baseSha
},
)
.
then
(
done
.
fail
)
.
then
(
done
.
fail
)
.
catch
(()
=>
{
.
catch
(()
=>
{
expect
(
dispatch
).
toHaveBeenCalledWith
(
'
setErrorMessage
'
,
{
expect
(
dispatch
).
toHaveBeenCalledWith
(
'
setErrorMessage
'
,
{
...
...
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