Commit 8d7cc02a authored by Rémy Coutable's avatar Rémy Coutable Committed by Robert Speicher

Fix more hardcoded spec/ee paths to ee/spec

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent d6b978d0
...@@ -29,8 +29,7 @@ we should make sure that we no longer edit CE files in place in order to ...@@ -29,8 +29,7 @@ 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 codes should be put inside the `ee/` top-level directory, and
tests should be put inside `spec/ee/`. We don't use `ee/spec` for now due to tests should be put inside `ee/spec/`. The rest of codes should be as close as to the CE files.
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/`
......
...@@ -136,7 +136,7 @@ learn more. ...@@ -136,7 +136,7 @@ learn more.
## EE-specific tests ## EE-specific tests
EE-specific tests follows the same organization, but under the `spec/ee` folder. 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?
......
...@@ -16,7 +16,7 @@ module FixtureHelpers ...@@ -16,7 +16,7 @@ module FixtureHelpers
end end
def expand_fixture_ee_path(filename) def expand_fixture_ee_path(filename)
File.expand_path(Rails.root.join('spec/ee/fixtures/', filename)) File.expand_path(Rails.root.join('ee/spec/fixtures/', filename))
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment