refactored factory + fixed tests

3 files changed, 8 insertions, 21 deletions

diff --git a/spec/factories.rb b/spec/factories.rb
index 760465aaf9f..82d73fec5ca 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -47,6 +47,12 @@ FactoryGirl.define do
     owner
   end
 
+  factory :group do
+    sequence(:name) { |n| "group#{n}" }
+    code { name.downcase.gsub(/\s/, '_') }
+    owner
+  end
+
   factory :users_project do
     user
     project
diff --git a/spec/factories/groups.rb b/spec/factories/groups.rb
deleted file mode 100644
index d583b186fed..00000000000
--- a/spec/factories/groups.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# == Schema Information
-#
-# Table name: groups
-#
-#  id         :integer         not null, primary key
-#  name       :string(255)     not null
-#  code       :string(255)     not null
-#  owner_id   :integer         not null
-#  created_at :datetime        not null
-#  updated_at :datetime        not null
-#
-
-# Read about factories at https://github.com/thoughtbot/factory_girl
-
-FactoryGirl.define do
-  factory :group do
-    name "MyString"
-    code "MyString"
-    owner_id 1
-  end
-end
diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index eea196fd864..fd7db4b25d9 100644
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
@@ -13,6 +13,8 @@
 require 'spec_helper'
 
 describe Group do
+  let!(:group) { create(:group) }
+
   it { should have_many :projects }
   it { should validate_presence_of :name }
   it { should validate_uniqueness_of(:name) }