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
f6906238
Commit
f6906238
authored
Sep 11, 2020
by
Denys Mishunov
Committed by
Olena Horal-Koretska
Sep 11, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ace to Editor Lite on CI linting
Replaced the old ACE with the new Editor Lite
parent
9c4d9f98
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
165 additions
and
66 deletions
+165
-66
app/assets/javascripts/pages/projects/ci/lints/ci_lint_editor.js
...ets/javascripts/pages/projects/ci/lints/ci_lint_editor.js
+38
-9
app/views/projects/ci/lints/show.html.haml
app/views/projects/ci/lints/show.html.haml
+10
-4
changelogs/unreleased/198606-editor-lite-ci-linting.yml
changelogs/unreleased/198606-editor-lite-ci-linting.yml
+5
-0
spec/features/projects/ci/lint_spec.rb
spec/features/projects/ci/lint_spec.rb
+83
-53
spec/support/helpers/features/editor_lite_spec_helpers.rb
spec/support/helpers/features/editor_lite_spec_helpers.rb
+29
-0
No files found.
app/assets/javascripts/pages/projects/ci/lints/ci_lint_editor.js
View file @
f6906238
import
createFlash
from
'
~/flash
'
;
import
{
BLOB_EDITOR_ERROR
}
from
'
~/blob_edit/constants
'
;
export
default
class
CILintEditor
{
export
default
class
CILintEditor
{
constructor
()
{
constructor
()
{
this
.
editor
=
window
.
ace
.
edit
(
'
ci-editor
'
);
const
monacoEnabled
=
window
?.
gon
?.
features
?.
monacoCi
;
this
.
textarea
=
document
.
querySelector
(
'
#content
'
);
this
.
clearYml
=
document
.
querySelector
(
'
.clear-yml
'
);
this
.
clearYml
=
document
.
querySelector
(
'
.clear-yml
'
);
this
.
editor
.
getSession
().
setMode
(
'
ace/mode/yaml
'
);
this
.
editor
.
on
(
'
input
'
,
()
=>
{
const
content
=
this
.
editor
.
getSession
().
getValue
();
this
.
textarea
.
value
=
content
;
});
this
.
clearYml
.
addEventListener
(
'
click
'
,
this
.
clear
.
bind
(
this
));
this
.
clearYml
.
addEventListener
(
'
click
'
,
this
.
clear
.
bind
(
this
));
return
monacoEnabled
?
this
.
initEditorLite
()
:
this
.
initAce
();
}
}
clear
()
{
clear
()
{
this
.
editor
.
setValue
(
''
);
this
.
editor
.
setValue
(
''
);
}
}
initEditorLite
()
{
import
(
/* webpackChunkName: 'monaco_editor_lite' */
'
~/editor/editor_lite
'
)
.
then
(({
default
:
EditorLite
})
=>
{
const
editorEl
=
document
.
getElementById
(
'
editor
'
);
const
fileContentEl
=
document
.
getElementById
(
'
content
'
);
const
form
=
document
.
querySelector
(
'
.js-ci-lint-form
'
);
const
rootEditor
=
new
EditorLite
();
this
.
editor
=
rootEditor
.
createInstance
({
el
:
editorEl
,
blobPath
:
'
.gitlab-ci.yml
'
,
blobContent
:
editorEl
.
innerText
,
});
form
.
addEventListener
(
'
submit
'
,
()
=>
{
fileContentEl
.
value
=
this
.
editor
.
getValue
();
});
})
.
catch
(()
=>
createFlash
({
message
:
BLOB_EDITOR_ERROR
}));
}
initAce
()
{
this
.
editor
=
window
.
ace
.
edit
(
'
ci-editor
'
);
this
.
textarea
=
document
.
getElementById
(
'
content
'
);
this
.
editor
.
getSession
().
setMode
(
'
ace/mode/yaml
'
);
this
.
editor
.
on
(
'
input
'
,
()
=>
{
this
.
textarea
.
value
=
this
.
editor
.
getSession
().
getValue
();
});
}
}
}
app/views/projects/ci/lints/show.html.haml
View file @
f6906238
-
page_title
_
(
"CI Lint"
)
-
page_title
_
(
"CI Lint"
)
-
page_description
_
(
"Validate your GitLab CI configuration file"
)
-
page_description
_
(
"Validate your GitLab CI configuration file"
)
-
content_for
:library_javascripts
do
-
unless
Feature
.
enabled?
(
:monaco_ci
)
=
page_specific_javascript_tag
(
'lib/ace.js'
)
-
content_for
:library_javascripts
do
=
page_specific_javascript_tag
(
'lib/ace.js'
)
%h2
.pt-3.pb-3
=
_
(
"Validate your GitLab CI configuration"
)
%h2
.pt-3.pb-3
=
_
(
"Validate your GitLab CI configuration"
)
.project-ci-linter
.project-ci-linter
=
form_tag
project_ci_lint_path
(
@project
),
method: :post
do
=
form_tag
project_ci_lint_path
(
@project
),
method: :post
,
class:
'js-ci-lint-form'
do
.row
.row
.col-sm-12
.col-sm-12
.file-holder
.file-holder
.js-file-title.file-title.clearfix
.js-file-title.file-title.clearfix
=
_
(
"Contents of .gitlab-ci.yml"
)
=
_
(
"Contents of .gitlab-ci.yml"
)
#ci-editor
.ci-editor
=
@content
-
if
Feature
.
enabled?
(
:monaco_ci
)
.file-editor.code
.js-edit-mode-pane.qa-editor
#editor
{
data:
{
'editor-loading'
:
true
}
}
<
%pre
.editor-loading-content
=
params
[
:content
]
-
else
#ci-editor
.ci-editor
=
@content
=
text_area_tag
(
:content
,
@content
,
class:
'hidden form-control span1'
,
rows:
7
,
require:
true
)
=
text_area_tag
(
:content
,
@content
,
class:
'hidden form-control span1'
,
rows:
7
,
require:
true
)
.col-sm-12
.col-sm-12
.float-left.gl-mt-3
.float-left.gl-mt-3
...
...
changelogs/unreleased/198606-editor-lite-ci-linting.yml
0 → 100644
View file @
f6906238
---
title
:
Replaced ACE with Editor Lite on CI linting view
merge_request
:
41895
author
:
type
:
changed
spec/features/projects/ci/lint_spec.rb
View file @
f6906238
...
@@ -3,89 +3,119 @@
...
@@ -3,89 +3,119 @@
require
'spec_helper'
require
'spec_helper'
RSpec
.
describe
'CI Lint'
,
:js
do
RSpec
.
describe
'CI Lint'
,
:js
do
include
Spec
::
Support
::
Helpers
::
Features
::
EditorLiteSpecHelpers
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:project
)
{
create
(
:project
,
:repository
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
before
do
shared_examples
'correct ci linting process'
do
project
.
add_developer
(
user
)
describe
'YAML parsing'
do
sign_in
(
user
)
shared_examples
'validates the YAML'
do
before
do
visit
project_ci_lint_path
(
project
)
click_on
'Validate'
find
(
'#ci-editor'
)
end
execute_script
(
"ace.edit('ci-editor').setValue(
#{
yaml_content
.
to_json
}
);"
)
# Ace editor updates a hidden textarea and it happens asynchronously
context
'YAML is correct'
do
wait_for
(
'YAML content'
)
do
let
(
:yaml_content
)
do
find
(
'.ace_content'
).
text
.
present?
File
.
read
(
Rails
.
root
.
join
(
'spec/support/gitlab_stubs/gitlab_ci.yml'
))
end
end
end
describe
'YAML parsing'
do
it
'parses Yaml and displays the jobs'
do
shared_examples
'validates the YAML'
do
expect
(
page
).
to
have_content
(
'Status: syntax is correct'
)
before
do
click_on
'Validate'
end
context
'YAML is correct'
do
within
"table"
do
let
(
:yaml_content
)
do
aggregate_failures
do
File
.
read
(
Rails
.
root
.
join
(
'spec/support/gitlab_stubs/gitlab_ci.yml'
))
expect
(
page
).
to
have_content
(
'Job - rspec'
)
expect
(
page
).
to
have_content
(
'Job - spinach'
)
expect
(
page
).
to
have_content
(
'Deploy Job - staging'
)
expect
(
page
).
to
have_content
(
'Deploy Job - production'
)
end
end
end
end
end
it
'parses Yaml and displays the jobs
'
do
context
'YAML is incorrect
'
do
expect
(
page
).
to
have_content
(
'Status: syntax is correct'
)
let
(
:yaml_content
)
{
'value: cannot have :'
}
within
"table"
do
it
'displays information about an error'
do
aggregate_failures
do
expect
(
page
).
to
have_content
(
'Status: syntax is incorrect'
)
expect
(
page
).
to
have_content
(
'Job - rspec'
)
expect
(
page
).
to
have_selector
(
content_selector
,
text:
yaml_content
)
expect
(
page
).
to
have_content
(
'Job - spinach'
)
expect
(
page
).
to
have_content
(
'Deploy Job - staging'
)
expect
(
page
).
to
have_content
(
'Deploy Job - production'
)
end
end
end
end
end
end
end
context
'YAML is incorrect'
do
it_behaves_like
'validates the YAML'
let
(
:yaml_content
)
{
'value: cannot have :'
}
it
'displays information about an error
'
do
context
'when Dry Run is checked
'
do
expect
(
page
).
to
have_content
(
'Status: syntax is incorrect'
)
before
do
expect
(
page
).
to
have_selector
(
'.ace_content'
,
text:
yaml_content
)
check
'Simulate a pipeline created for the default branch'
end
end
it_behaves_like
'validates the YAML'
end
end
end
it_behaves_like
'validates the YAML'
describe
'YAML revalidate'
do
let
(
:yaml_content
)
{
'my yaml content'
}
context
'when Dry Run is checked'
do
it
'loads previous YAML content after validation'
do
expect
(
page
).
to
have_field
(
'content'
,
with:
'my yaml content'
,
visible:
false
,
type:
'textarea'
)
end
end
end
describe
'YAML clearing'
do
before
do
before
do
c
heck
'Simulate a pipeline created for the default branch
'
c
lick_on
'Clear
'
end
end
it_behaves_like
'validates the YAML'
context
'YAML is present'
do
let
(
:yaml_content
)
do
File
.
read
(
Rails
.
root
.
join
(
'spec/support/gitlab_stubs/gitlab_ci.yml'
))
end
it
'YAML content is cleared'
do
expect
(
page
).
to
have_field
(
'content'
,
with:
''
,
visible:
false
,
type:
'textarea'
)
end
end
end
end
end
describe
'YAML revalidate'
do
context
'with ACE editor'
do
let
(
:yaml_content
)
{
'my yaml content'
}
it_behaves_like
'correct ci linting process'
do
let
(
:content_selector
)
{
'.ace_content'
}
it
'loads previous YAML content after validation'
do
before
do
expect
(
page
).
to
have_field
(
'content'
,
with:
'my yaml content'
,
visible:
false
,
type:
'textarea'
)
stub_feature_flags
(
monaco_ci:
false
)
project
.
add_developer
(
user
)
sign_in
(
user
)
visit
project_ci_lint_path
(
project
)
find
(
'#ci-editor'
)
execute_script
(
"ace.edit('ci-editor').setValue(
#{
yaml_content
.
to_json
}
);"
)
# Ace editor updates a hidden textarea and it happens asynchronously
wait_for
(
'YAML content'
)
do
find
(
content_selector
).
text
.
present?
end
end
end
end
end
end
end
describe
'YAML clearing'
do
context
'with Editor Lite'
do
before
do
it_behaves_like
'correct ci linting process'
do
click_on
'Clear'
let
(
:content_selector
)
{
'.content .view-lines'
}
end
context
'YAML is present'
do
before
do
let
(
:yaml_content
)
do
stub_feature_flags
(
monaco_ci:
true
)
File
.
read
(
Rails
.
root
.
join
(
'spec/support/gitlab_stubs/gitlab_ci.yml'
)
)
project
.
add_developer
(
user
)
end
sign_in
(
user
)
it
'YAML content is cleared'
do
visit
project_ci_lint_path
(
project
)
expect
(
page
).
to
have_field
(
'content'
,
with:
''
,
visible:
false
,
type:
'textarea'
)
editor_set_value
(
yaml_content
)
wait_for
(
'YAML content'
)
do
find
(
content_selector
).
text
.
present?
end
end
end
end
end
end
end
...
...
spec/support/helpers/features/editor_lite_spec_helpers.rb
0 → 100644
View file @
f6906238
# frozen_string_literal: true
# These helpers help you interact within the Editor Lite (single-file editor, snippets, etc.).
#
module
Spec
module
Support
module
Helpers
module
Features
module
EditorLiteSpecHelpers
include
ActionView
::
Helpers
::
JavaScriptHelper
def
editor_set_value
(
value
)
editor
=
find
(
'.monaco-editor'
)
uri
=
editor
[
'data-uri'
]
execute_script
(
"monaco.editor.getModel('
#{
uri
}
').setValue('
#{
escape_javascript
(
value
)
}
')"
)
end
def
editor_get_value
editor
=
find
(
'.monaco-editor'
)
uri
=
editor
[
'data-uri'
]
evaluate_script
(
"monaco.editor.getModel('
#{
uri
}
').getValue()"
)
end
end
end
end
end
end
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