1 files changed, 18 insertions, 25 deletions

diff --git a/spec/lib/gitlab/regex_spec.rb b/spec/lib/gitlab/regex_spec.rb
index 127cd8c78d8..68a57826647 100644
--- a/spec/lib/gitlab/regex_spec.rb
+++ b/spec/lib/gitlab/regex_spec.rb
@@ -1,19 +1,7 @@
 # coding: utf-8
 require 'spec_helper'
 
-describe Gitlab::Regex, lib: true do
-  describe '.project_path_regex' do
-    subject { described_class.project_path_regex }
-
-    it { is_expected.to match('gitlab-ce') }
-    it { is_expected.to match('gitlab_git') }
-    it { is_expected.to match('_underscore.js') }
-    it { is_expected.to match('100px.com') }
-    it { is_expected.not_to match('?gitlab') }
-    it { is_expected.not_to match('git lab') }
-    it { is_expected.not_to match('gitlab.git') }
-  end
-
+describe Gitlab::Regex do
   describe '.project_name_regex' do
     subject { described_class.project_name_regex }
 
@@ -26,10 +14,16 @@ describe Gitlab::Regex, lib: true do
     it { is_expected.not_to match('?gitlab') }
   end
 
-  describe '.file_name_regex' do
-    subject { described_class.file_name_regex }
+  describe '.environment_slug_regex' do
+    subject { described_class.environment_name_regex }
 
-    it { is_expected.to match('foo@bar') }
+    it { is_expected.to match('foo') }
+    it { is_expected.to match('foo-1') }
+    it { is_expected.to match('FOO') }
+    it { is_expected.to match('foo/1') }
+    it { is_expected.to match('foo.1') }
+    it { is_expected.not_to match('9&foo') }
+    it { is_expected.not_to match('foo-^') }
   end
 
   describe '.environment_slug_regex' do
@@ -45,15 +39,14 @@ describe Gitlab::Regex, lib: true do
     it { is_expected.not_to match('foo-') }
   end
 
-  describe 'FULL_NAMESPACE_REGEX_STR' do
-    subject { %r{\A#{Gitlab::Regex::FULL_NAMESPACE_REGEX_STR}\z} }
+  describe '.container_repository_name_regex' do
+    subject { described_class.container_repository_name_regex }
 
-    it { is_expected.to match('gitlab.org') }
-    it { is_expected.to match('gitlab.org/gitlab-git') }
-    it { is_expected.not_to match('gitlab.org.') }
-    it { is_expected.not_to match('gitlab.org/') }
-    it { is_expected.not_to match('/gitlab.org') }
-    it { is_expected.not_to match('gitlab.git') }
-    it { is_expected.not_to match('gitlab git') }
+    it { is_expected.to match('image') }
+    it { is_expected.to match('my/image') }
+    it { is_expected.to match('my/awesome/image-1') }
+    it { is_expected.to match('my/awesome/image.test') }
+    it { is_expected.not_to match('.my/image') }
+    it { is_expected.not_to match('my/image.') }
   end
 end