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
Boxiang Sun
gitlab-ce
Commits
95d38ac9
Commit
95d38ac9
authored
Mar 15, 2017
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove all references to the .es6 in our config files and documentation
parent
68e40bd4
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
14 additions
and
16 deletions
+14
-16
.gitattributes
.gitattributes
+0
-1
.gitlab-ci.yml
.gitlab-ci.yml
+1
-1
config/karma.config.js
config/karma.config.js
+1
-1
config/webpack.config.js
config/webpack.config.js
+2
-2
doc/development/testing.md
doc/development/testing.md
+2
-2
lib/banzai/pipeline/gfm_pipeline.rb
lib/banzai/pipeline/gfm_pipeline.rb
+2
-2
package.json
package.json
+3
-4
spec/features/copy_as_gfm_spec.rb
spec/features/copy_as_gfm_spec.rb
+1
-1
spec/javascripts/test_bundle.js
spec/javascripts/test_bundle.js
+2
-2
No files found.
.gitattributes
deleted
100644 → 0
View file @
68e40bd4
*.js.es6 gitlab-language=javascript
.gitlab-ci.yml
View file @
95d38ac9
...
...
@@ -368,7 +368,7 @@ lint:javascript:report:
stage
:
post-test
before_script
:
[]
script
:
-
find app/ spec/ -name '*.js' -
or -name '*.js.es6' -
exec sed --in-place 's|/\* eslint-disable .*\*/||' {} \;
# run report over all files
-
find app/ spec/ -name '*.js' -exec sed --in-place 's|/\* eslint-disable .*\*/||' {} \;
# run report over all files
-
yarn run eslint-report ||
true
# ignore exit code
artifacts
:
name
:
eslint-report
...
...
config/karma.config.js
View file @
95d38ac9
...
...
@@ -36,7 +36,7 @@ module.exports = function(config) {
{
pattern
:
'
spec/javascripts/fixtures/**/*@(.json|.html|.html.raw)
'
,
included
:
false
},
],
preprocessors
:
{
'
spec/javascripts/**/*.js
?(.es6)
'
:
[
'
webpack
'
,
'
sourcemap
'
],
'
spec/javascripts/**/*.js
'
:
[
'
webpack
'
,
'
sourcemap
'
],
},
reporters
:
[
progressReporter
,
'
coverage-istanbul
'
],
coverageIstanbulReporter
:
{
...
...
config/webpack.config.js
View file @
95d38ac9
...
...
@@ -56,7 +56,7 @@ var config = {
module
:
{
rules
:
[
{
test
:
/
\.
(
js|es6
)
$/
,
test
:
/
\.
js
$/
,
exclude
:
/
(
node_modules|vendor
\/
assets
)
/
,
loader
:
'
babel-loader
'
,
options
:
{
...
...
@@ -130,7 +130,7 @@ var config = {
],
resolve
:
{
extensions
:
[
'
.js
'
,
'
.es6
'
,
'
.js.es6
'
],
extensions
:
[
'
.js
'
],
alias
:
{
'
~
'
:
path
.
join
(
ROOT_PATH
,
'
app/assets/javascripts
'
),
'
emojis
'
:
path
.
join
(
ROOT_PATH
,
'
fixtures/emojis
'
),
...
...
doc/development/testing.md
View file @
95d38ac9
...
...
@@ -35,8 +35,8 @@ GitLab uses [Karma] to run its [Jasmine] JavaScript specs. They can be run on
the command line via
`bundle exec karma`
.
-
JavaScript tests live in
`spec/javascripts/`
, matching the folder structure of
`app/assets/javascripts/`
:
`app/assets/javascripts/behaviors/autosize.js
.es6
`
has a corresponding
`spec/javascripts/behaviors/autosize_spec.js
.es6
`
file.
`app/assets/javascripts/`
:
`app/assets/javascripts/behaviors/autosize.js`
has a corresponding
`spec/javascripts/behaviors/autosize_spec.js`
file.
-
Haml fixtures required for JavaScript tests live in
`spec/javascripts/fixtures`
. They should contain the bare minimum amount of
markup necessary for the test.
...
...
lib/banzai/pipeline/gfm_pipeline.rb
View file @
95d38ac9
...
...
@@ -2,10 +2,10 @@ module Banzai
module
Pipeline
class
GfmPipeline
<
BasePipeline
# These filters convert GitLab Flavored Markdown (GFM) to HTML.
# The handlers defined in app/assets/javascripts/copy_as_gfm.js
.es6
# The handlers defined in app/assets/javascripts/copy_as_gfm.js
# consequently convert that same HTML to GFM to be copied to the clipboard.
# Every filter that generates HTML from GFM should have a handler in
# app/assets/javascripts/copy_as_gfm.js
.es6
, in reverse order.
# app/assets/javascripts/copy_as_gfm.js, in reverse order.
# The GFM-to-HTML-to-GFM cycle is tested in spec/features/copy_as_gfm_spec.rb.
def
self
.
filters
@filters
||=
FilterArray
[
...
...
package.json
View file @
95d38ac9
...
...
@@ -2,9 +2,9 @@
"private"
:
true
,
"scripts"
:
{
"dev-server"
:
"webpack-dev-server --config config/webpack.config.js"
,
"eslint"
:
"eslint --max-warnings 0 --ext .js
,.js.es6
."
,
"eslint-fix"
:
"eslint --max-warnings 0 --ext .js
,.js.es6
--fix ."
,
"eslint-report"
:
"eslint --max-warnings 0 --ext .js
,.js.es6
--format html --output-file ./eslint-report.html ."
,
"eslint"
:
"eslint --max-warnings 0 --ext .js ."
,
"eslint-fix"
:
"eslint --max-warnings 0 --ext .js --fix ."
,
"eslint-report"
:
"eslint --max-warnings 0 --ext .js --format html --output-file ./eslint-report.html ."
,
"karma"
:
"karma start config/karma.config.js --single-run"
,
"karma-start"
:
"karma start config/karma.config.js"
,
"webpack"
:
"webpack --config config/webpack.config.js"
,
...
...
@@ -62,7 +62,6 @@
"exclude"
:
[
"spec/javascripts/test_bundle.js"
,
"spec/javascripts/**/*_spec.js"
,
"spec/javascripts/**/*_spec.js.es6"
,
"app/assets/javascripts/droplab/**/*"
]
}
...
...
spec/features/copy_as_gfm_spec.rb
View file @
95d38ac9
...
...
@@ -20,7 +20,7 @@ describe 'Copy as GFM', feature: true, js: true do
end
# The filters referenced in lib/banzai/pipeline/gfm_pipeline.rb convert GitLab Flavored Markdown (GFM) to HTML.
# The handlers defined in app/assets/javascripts/copy_as_gfm.js
.es6
consequently convert that same HTML to GFM.
# The handlers defined in app/assets/javascripts/copy_as_gfm.js consequently convert that same HTML to GFM.
# To make sure these filters and handlers are properly aligned, this spec tests the GFM-to-HTML-to-GFM cycle
# by verifying (`html_to_gfm(gfm_to_html(gfm)) == gfm`) for a number of examples of GFM for every filter, using the `verify` helper.
...
...
spec/javascripts/test_bundle.js
View file @
95d38ac9
...
...
@@ -48,10 +48,10 @@ describe('Uncovered files', function () {
'
./network/branch_graph.js
'
,
];
const
sourceFiles
=
require
.
context
(
'
~
'
,
true
,
/^
\.\/(?!
application
\.
js
)
.*
\.
(
js|es6
)
$/
);
const
sourceFiles
=
require
.
context
(
'
~
'
,
true
,
/^
\.\/(?!
application
\.
js
)
.*
\.
js
$/
);
sourceFiles
.
keys
().
forEach
(
function
(
path
)
{
// ignore if there is a matching spec file
if
(
testsContext
.
keys
().
indexOf
(
`
${
path
.
replace
(
/
\.
js
(\.
es6
)?
$/
,
''
)}
_spec`
)
>
-
1
)
{
if
(
testsContext
.
keys
().
indexOf
(
`
${
path
.
replace
(
/
\.
js$/
,
''
)}
_spec`
)
>
-
1
)
{
return
;
}
...
...
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