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
2bdb5780
Commit
2bdb5780
authored
Feb 13, 2018
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Port some RuboCop and doc changes from EE
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
7f4b14b1
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
33 additions
and
6 deletions
+33
-6
.rubocop.yml
.rubocop.yml
+26
-2
doc/development/ee_features.md
doc/development/ee_features.md
+3
-4
doc/development/testing_guide/testing_levels.md
doc/development/testing_guide/testing_levels.md
+4
-0
No files found.
.rubocop.yml
View file @
2bdb5780
...
@@ -10,15 +10,26 @@ AllCops:
...
@@ -10,15 +10,26 @@ AllCops:
Exclude
:
Exclude
:
-
'
vendor/**/*'
-
'
vendor/**/*'
-
'
node_modules/**/*'
-
'
node_modules/**/*'
-
'
db/*'
-
'
db/*
*/*
'
-
'
db/fixtures/**/*'
-
'
db/fixtures/**/*'
-
'
db/geo
/*'
-
'
ee/db/**
/*'
-
'
tmp/**/*'
-
'
tmp/**/*'
-
'
bin/**/*'
-
'
bin/**/*'
-
'
generator_templates/**/*'
-
'
generator_templates/**/*'
-
'
builds/**/*'
-
'
builds/**/*'
CacheRootDirectory
:
tmp
CacheRootDirectory
:
tmp
# This cop checks whether some constant value isn't a
# mutable literal (e.g. array or hash).
Style/MutableConstant
:
Enabled
:
true
Exclude
:
-
'
db/migrate/**/*'
-
'
db/post_migrate/**/*'
-
'
ee/db/migrate/**/*'
-
'
ee/db/post_migrate/**/*'
-
'
ee/db/geo/migrate/**/*'
# Gitlab ###################################################################
# Gitlab ###################################################################
Gitlab/ModuleWithInstanceVariables
:
Gitlab/ModuleWithInstanceVariables
:
...
@@ -33,3 +44,16 @@ Gitlab/ModuleWithInstanceVariables:
...
@@ -33,3 +44,16 @@ Gitlab/ModuleWithInstanceVariables:
# We ignore spec helpers because it usually doesn't matter
# We ignore spec helpers because it usually doesn't matter
-
spec/support/**/*.rb
-
spec/support/**/*.rb
-
features/steps/**/*.rb
-
features/steps/**/*.rb
GitlabSecurity/PublicSend
:
Enabled
:
true
Exclude
:
-
'
config/**/*'
-
'
db/**/*'
-
'
features/**/*'
-
'
lib/**/*.rake'
-
'
qa/**/*'
-
'
spec/**/*'
-
'
ee/db/**/*'
-
'
ee/lib/**/*.rake'
-
'
ee/spec/**/*'
doc/development/ee_features.md
View file @
2bdb5780
...
@@ -28,9 +28,8 @@ we still need to merge changes from GitLab CE to EE. To help us get there,
...
@@ -28,9 +28,8 @@ we still need to merge changes from GitLab CE to EE. To help us get there,
we should make sure that we no longer edit CE files in place in order to
we should make sure that we no longer edit CE files in place in order to
implement EE features.
implement EE features.
Instead, all EE codes should be put inside the
`ee/`
top-level directory, and
Instead, all EE code should be put inside the
`ee/`
top-level directory. The
tests should be put inside
`spec/ee/`
. We don't use
`ee/spec`
for now due to
rest of the code should be as close to the CE files as possible.
technical limitation. The rest of codes should be as close as to the CE files.
[
single code base
]:
https://gitlab.com/gitlab-org/gitlab-ee/issues/2952#note_41016454
[
single code base
]:
https://gitlab.com/gitlab-org/gitlab-ee/issues/2952#note_41016454
...
@@ -318,7 +317,7 @@ When you're testing EE-only features, avoid adding examples to the
...
@@ -318,7 +317,7 @@ When you're testing EE-only features, avoid adding examples to the
existing CE specs. Also do no change existing CE examples, since they
existing CE specs. Also do no change existing CE examples, since they
should remain working as-is when EE is running without a license.
should remain working as-is when EE is running without a license.
Instead place EE specs in the
`
spec/
ee/spec`
folder.
Instead place EE specs in the
`ee/spec`
folder.
## JavaScript code in `assets/javascripts/`
## JavaScript code in `assets/javascripts/`
...
...
doc/development/testing_guide/testing_levels.md
View file @
2bdb5780
...
@@ -134,6 +134,10 @@ learn more.
...
@@ -134,6 +134,10 @@ learn more.
[
GitLab QA
]:
https://gitlab.com/gitlab-org/gitlab-qa
[
GitLab QA
]:
https://gitlab.com/gitlab-org/gitlab-qa
[
part of GitLab Rails
]:
https://gitlab.com/gitlab-org/gitlab-ce/tree/master/qa
[
part of GitLab Rails
]:
https://gitlab.com/gitlab-org/gitlab-ce/tree/master/qa
## EE-specific tests
EE-specific tests follows the same organization, but under the
`ee/spec`
folder.
## How to test at the correct level?
## How to test at the correct level?
As many things in life, deciding what to test at each level of testing is a
As many things in life, deciding what to test at each level of testing is a
...
...
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