summaryrefslogtreecommitdiff
path: root/spec/models/design_management
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-05-11 09:09:45 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-05-11 09:09:45 +0000
commitc7ba7b997608a103a0a9165b2e5cef9530c4ef53 (patch)
tree3af88eaacba25539b97da4ad358418b6a69c11d7 /spec/models/design_management
parenta031b1f4f34470fba578856dc7ab735a6f54733a (diff)
downloadgitlab-ce-c7ba7b997608a103a0a9165b2e5cef9530c4ef53.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/models/design_management')
-rw-r--r--spec/models/design_management/design_spec.rb7
1 files changed, 0 insertions, 7 deletions
diff --git a/spec/models/design_management/design_spec.rb b/spec/models/design_management/design_spec.rb
index 555b7f04f86..95782c1f674 100644
--- a/spec/models/design_management/design_spec.rb
+++ b/spec/models/design_management/design_spec.rb
@@ -380,15 +380,8 @@ describe DesignManagement::Design do
end
end
- # TODO these tests are being temporarily skipped unless run in EE,
- # as we are in the process of moving Design Management to FOSS in 13.0
- # in steps. In the current step the routes have not yet been moved.
- #
- # See https://gitlab.com/gitlab-org/gitlab/-/issues/212566#note_327724283.
describe '#note_etag_key' do
it 'returns a correct etag key' do
- skip 'See https://gitlab.com/gitlab-org/gitlab/-/issues/212566#note_327724283' unless Gitlab.ee?
-
design = create(:design)
expect(design.note_etag_key).to eq(