Move User.cleanup_username to Namespace.cleanup_path.

2 files changed, 10 insertions, 10 deletions

diff --git a/spec/models/namespace_spec.rb b/spec/models/namespace_spec.rb
index ed6845c82cc..48a3ab9c5a2 100644
--- a/spec/models/namespace_spec.rb
+++ b/spec/models/namespace_spec.rb
@@ -85,4 +85,14 @@ describe Namespace do
     it { expect(Namespace.find_by_path_or_name('WOW')).to eq(@namespace) }
     it { expect(Namespace.find_by_path_or_name('unknown')).to eq(nil) }
   end
+
+  describe ".clean_path" do
+
+    let!(:user)       { create(:user, username: "johngitlab-etc") }
+    let!(:namespace)  { create(:namespace, path: "JohnGitLab-etc1") }
+
+    it "cleans the path and makes sure it's available" do
+      expect(Namespace.clean_path("-john+gitlab-ETC%.git@gmail.com")).to eq("johngitlab-ETC2")
+    end
+  end
 end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 10e90cae143..24384e8bf22 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -307,16 +307,6 @@ describe User do
     end
   end
 
-  describe ".clean_username" do
-
-    let!(:user) { create(:user, username: "johngitlab-etc") }
-    let!(:namespace) { create(:namespace, path: "JohnGitLab-etc1") }
-
-    it "cleans a username and makes sure it's available" do
-      expect(User.clean_username("-john+gitlab-ETC%.git@gmail.com")).to eq("johngitlab-ETC2")
-    end
-  end
-
   describe 'all_ssh_keys' do
     it { is_expected.to have_many(:keys).dependent(:destroy) }