Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
95d38ac9
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
95d38ac9
编写于
3月 15, 2017
作者:
M
Mike Greiling
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove all references to the .es6 in our config files and documentation
上级
68e40bd4
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
14 addition
and
16 deletion
+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
未找到文件。
.gitattributes
已删除
100644 → 0
浏览文件 @
68e40bd4
*.js.es6 gitlab-language=javascript
.gitlab-ci.yml
浏览文件 @
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
浏览文件 @
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
浏览文件 @
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
浏览文件 @
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
浏览文件 @
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
浏览文件 @
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
浏览文件 @
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
浏览文件 @
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
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录