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
dbd1c03d
Commit
dbd1c03d
authored
May 06, 2020
by
Himanshu Kapoor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrate spec/javascripts/diffs to Jest
Only mock files remained, so those can be deleted.
parent
c4a2a132
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
2 additions
and
36 deletions
+2
-36
spec/frontend/diffs/components/diff_content_spec.js
spec/frontend/diffs/components/diff_content_spec.js
+1
-1
spec/javascripts/diffs/create_diffs_store.js
spec/javascripts/diffs/create_diffs_store.js
+0
-5
spec/javascripts/diffs/mock_data/diff_discussions.js
spec/javascripts/diffs/mock_data/diff_discussions.js
+0
-5
spec/javascripts/diffs/mock_data/diff_file.js
spec/javascripts/diffs/mock_data/diff_file.js
+0
-5
spec/javascripts/diffs/mock_data/diff_file_unreadable.js
spec/javascripts/diffs/mock_data/diff_file_unreadable.js
+0
-5
spec/javascripts/diffs/mock_data/diff_with_commit.js
spec/javascripts/diffs/mock_data/diff_with_commit.js
+0
-7
spec/javascripts/diffs/mock_data/merge_request_diffs.js
spec/javascripts/diffs/mock_data/merge_request_diffs.js
+0
-7
spec/javascripts/helpers/init_vue_mr_page_helper.js
spec/javascripts/helpers/init_vue_mr_page_helper.js
+1
-1
No files found.
spec/frontend/diffs/components/diff_content_spec.js
View file @
dbd1c03d
...
...
@@ -10,7 +10,7 @@ import ImageDiffOverlay from '~/diffs/components/image_diff_overlay.vue';
import
NoteForm
from
'
~/notes/components/note_form.vue
'
;
import
DiffDiscussions
from
'
~/diffs/components/diff_discussions.vue
'
;
import
{
IMAGE_DIFF_POSITION_TYPE
}
from
'
~/diffs/constants
'
;
import
diffFileMockData
from
'
../
../../javascripts/diffs/
mock_data/diff_file
'
;
import
diffFileMockData
from
'
../mock_data/diff_file
'
;
import
{
diffViewerModes
}
from
'
~/ide/constants
'
;
const
localVue
=
createLocalVue
();
...
...
spec/javascripts/diffs/create_diffs_store.js
deleted
100644 → 0
View file @
c4a2a132
// No new code should be added to this file. Instead, modify the
// file this one re-exports from. For more detail about why, see:
// https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/31349
export
{
default
}
from
'
../../frontend/diffs/create_diffs_store
'
;
spec/javascripts/diffs/mock_data/diff_discussions.js
deleted
100644 → 0
View file @
c4a2a132
// No new code should be added to this file. Instead, modify the
// file this one re-exports from. For more detail about why, see:
// https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/31349
export
{
default
}
from
'
../../../frontend/diffs/mock_data/diff_discussions
'
;
spec/javascripts/diffs/mock_data/diff_file.js
deleted
100644 → 0
View file @
c4a2a132
// No new code should be added to this file. Instead, modify the
// file this one re-exports from. For more detail about why, see:
// https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/31349
export
{
default
}
from
'
../../../frontend/diffs/mock_data/diff_file
'
;
spec/javascripts/diffs/mock_data/diff_file_unreadable.js
deleted
100644 → 0
View file @
c4a2a132
// No new code should be added to this file. Instead, modify the
// file this one re-exports from. For more detail about why, see:
// https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/31349
export
{
default
}
from
'
../../../frontend/diffs/mock_data/diff_file_unreadable
'
;
spec/javascripts/diffs/mock_data/diff_with_commit.js
deleted
100644 → 0
View file @
c4a2a132
// No new code should be added to this file. Instead, modify the
// file this one re-exports from. For more detail about why, see:
// https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/31349
import
getDiffWithCommit
from
'
../../../frontend/diffs/mock_data/diff_with_commit
'
;
export
default
getDiffWithCommit
;
spec/javascripts/diffs/mock_data/merge_request_diffs.js
deleted
100644 → 0
View file @
c4a2a132
// No new code should be added to this file. Instead, modify the
// file this one re-exports from. For more detail about why, see:
// https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/31349
import
diffsMockData
from
'
../../../frontend/diffs/mock_data/merge_request_diffs
'
;
export
default
diffsMockData
;
spec/javascripts/helpers/init_vue_mr_page_helper.js
View file @
dbd1c03d
...
...
@@ -2,7 +2,7 @@ import MockAdapter from 'axios-mock-adapter';
import
initMRPage
from
'
~/mr_notes/index
'
;
import
axios
from
'
~/lib/utils/axios_utils
'
;
import
{
userDataMock
,
notesDataMock
,
noteableDataMock
}
from
'
../../frontend/notes/mock_data
'
;
import
diffFileMockData
from
'
../diffs/mock_data/diff_file
'
;
import
diffFileMockData
from
'
../
../frontend/
diffs/mock_data/diff_file
'
;
export
default
function
initVueMRPage
()
{
const
mrTestEl
=
document
.
createElement
(
'
div
'
);
...
...
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