Get rid of roles

5 files changed, 10 insertions, 13 deletions

diff --git a/spec/roles/issue_commonality_spec.rb b/spec/lib/issue_commonality_spec.rb
index 11f278dea10..11f278dea10 100644
--- a/spec/roles/issue_commonality_spec.rb
+++ b/spec/lib/issue_commonality_spec.rb
diff --git a/spec/roles/votes_spec.rb b/spec/lib/votes_spec.rb
index 98666022a8f..98666022a8f 100644
--- a/spec/roles/votes_spec.rb
+++ b/spec/lib/votes_spec.rb
diff --git a/spec/roles/repository_spec.rb b/spec/models/project_repository_spec.rb
index e1d01cbfeaf..e1d01cbfeaf 100644
--- a/spec/roles/repository_spec.rb
+++ b/spec/models/project_repository_spec.rb
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index eb2717e38f3..5f6244ec5dd 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -185,4 +185,14 @@ describe User do
 
     it { User.not_in_project(@project).should == [@user, @project.owner] }
   end
+
+  describe 'normal user' do
+    let(:user) { create(:user, name: 'John Smith') }
+
+    it { user.is_admin?.should be_false }
+    it { user.require_ssh_key?.should be_true }
+    it { user.can_create_group?.should be_false }
+    it { user.can_create_project?.should be_true }
+    it { user.first_name.should == 'John' }
+  end
 end
diff --git a/spec/roles/account_role_spec.rb b/spec/roles/account_role_spec.rb
deleted file mode 100644
index f7a128d0978..00000000000
--- a/spec/roles/account_role_spec.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require 'spec_helper'
-
-describe User, "Account" do
-  describe 'normal user' do
-    let(:user) { create(:user, name: 'John Smith') }
-
-    it { user.is_admin?.should be_false }
-    it { user.require_ssh_key?.should be_true }
-    it { user.can_create_group?.should be_false }
-    it { user.can_create_project?.should be_true }
-    it { user.first_name.should == 'John' }
-  end
-end