Refactor tests (a little)

Author: root

Diff for: spec/factories/gitolite_public_key.rb

@@ -1,9 +1,10 @@
 FactoryGirl.define do
 
-  factory :gitolite_public_key do |gitolite_public_key|
-    gitolite_public_key.key_type 0
-    gitolite_public_key.title    'test-key'
-    gitolite_public_key.key      'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDpqFJzsx3wTi3t3X/eOizU6rdtNQoqg5uSjL89F+Ojjm2/sah3ouzx+3E461FDYaoJL58Qs9eRhL+ev0BY7khYXph8nIVDzNEjhLqjevX+YhpaW9Ll7V807CwAyvMNm08aup/NrrlI/jO+At348/ivJrfO7ClcPhq4+Id9RZfvbrKaitGOURD7q6Bd7xjUjELUN8wmYxu5zvx/2n/5woVdBUMXamTPxOY5y6DxTNJ+EYzrCr+bNb7459rWUvBHUQGI2fXDGmFpGiv6ShKRhRtwob1JHI8QC9OtxonrIUesa2dW6RFneUaM7tfRfffC704Uo7yuSswb7YK+p1A9QIt5 nicolas@tchoum'
+  factory :gitolite_public_key do |f|
+    f.key_type 0
+    f.title    'test-key'
+    f.key      'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDpqFJzsx3wTi3t3X/eOizU6rdtNQoqg5uSjL89F+Ojjm2/sah3ouzx+3E461FDYaoJL58Qs9eRhL+ev0BY7khYXph8nIVDzNEjhLqjevX+YhpaW9Ll7V807CwAyvMNm08aup/NrrlI/jO+At348/ivJrfO7ClcPhq4+Id9RZfvbrKaitGOURD7q6Bd7xjUjELUN8wmYxu5zvx/2n/5woVdBUMXamTPxOY5y6DxTNJ+EYzrCr+bNb7459rWUvBHUQGI2fXDGmFpGiv6ShKRhRtwob1JHI8QC9OtxonrIUesa2dW6RFneUaM7tfRfffC704Uo7yuSswb7YK+p1A9QIt5 nicolas@tchoum'
+    f.association :user
   end
 
 end

Diff for: spec/factories/project.rb

@@ -1,8 +1,8 @@
 FactoryGirl.define do
 
-  factory :project do |project|
-    project.sequence(:identifier)   { |n| "project#{n}"}
-    project.sequence(:name)         { |n| "Project#{n}"}
+  factory :project do |f|
+    f.sequence(:identifier)   { |n| "project#{n}"}
+    f.sequence(:name)         { |n| "Project#{n}"}
   end
 
 end

Diff for: spec/factories/repository_deployment_credential.rb

@@ -1,7 +1,10 @@
 FactoryGirl.define do
 
-  factory :repository_deployment_credential do |deployment_credential|
-    deployment_credential.perm  "RW+"
+  factory :repository_deployment_credential do |f|
+    f.perm        "RW+"
+    f.association :repository, :factory => :repository_git
+    f.association :user
+    f.association :gitolite_public_key
   end
 
 end

Diff for: spec/factories/repository_git.rb

@@ -1,7 +1,8 @@
 FactoryGirl.define do
 
-  factory :repository_git, :class => 'Repository::Git' do |repository|
-    repository.is_default  false
+  factory :repository_git, :class => 'Repository::Git' do |f|
+    f.is_default  false
+    f.association :project
   end
 
 end

Diff for: spec/factories/repository_git_config_key.rb

@@ -1,8 +1,9 @@
 FactoryGirl.define do
 
-  factory :repository_git_config_key do |git_config_key|
-    git_config_key.sequence(:key) { |n| "hookfoo.foo#{n}" }
-    git_config_key.value  'bar'
+  factory :repository_git_config_key do |f|
+    f.sequence(:key) { |n| "hookfoo.foo#{n}" }
+    f.value          'bar'
+    f.association    :repository, :factory => :repository_git
   end
 
 end

Diff for: spec/factories/repository_git_extra.rb

@@ -1,8 +1,9 @@
 FactoryGirl.define do
 
-  factory :repository_git_extra do |git_extra|
-    git_extra.git_http        0
-    git_extra.default_branch  "master"
+  factory :repository_git_extra do |f|
+    f.git_http        0
+    f.default_branch  "master"
+    f.association     :repository, :factory => :repository_git
   end
 
 end

Diff for: spec/factories/repository_git_notification.rb

@@ -1,10 +1,11 @@
 FactoryGirl.define do
 
-  factory :repository_git_notification do |git_notification|
-    git_notification.prefix          '[TEST PROJECT]'
-    git_notification.sender_address  '[email protected]'
-    git_notification.include_list    [ '[email protected]', '[email protected]']
-    git_notification.exclude_list    [ '[email protected]', '[email protected]']
+  factory :repository_git_notification do |f|
+    f.prefix          '[TEST PROJECT]'
+    f.sender_address  '[email protected]'
+    f.include_list    [ '[email protected]', '[email protected]']
+    f.exclude_list    [ '[email protected]', '[email protected]']
+    f.association     :repository, :factory => :repository_git
   end
 
 end

Diff for: spec/factories/repository_mirror.rb

@@ -1,8 +1,9 @@
 FactoryGirl.define do
 
-  factory :repository_mirror do |mirror|
-    mirror.sequence(:url) { |n| "ssh://host.xz/path/to/repo#{n}.git" }
-    mirror.push_mode 0
+  factory :repository_mirror do |f|
+    f.sequence(:url) { |n| "ssh://host.xz/path/to/repo#{n}.git" }
+    f.push_mode      0
+    f.association    :repository, :factory => :repository_git
   end
 
 end

Diff for: spec/factories/repository_post_receive_url.rb

@@ -1,7 +1,8 @@
 FactoryGirl.define do
 
-  factory :repository_post_receive_url do |post_receive_url|
-    post_receive_url.sequence(:url) { |n| "http://example.com/toto#{n}.php" }
+  factory :repository_post_receive_url do |f|
+    f.sequence(:url) { |n| "http://example.com/toto#{n}.php" }
+    f.association    :repository, :factory => :repository_git
   end
 
 end

Diff for: spec/factories/repository_protected_branche.rb

@@ -1,7 +1,7 @@
 FactoryGirl.define do
 
-  factory :repository_protected_branche do |protected_branch|
-
+  factory :repository_protected_branche do |f|
+    f.association    :repository, :factory => :repository_git
   end
 
 end

Diff for: spec/factories/repository_svn.rb

@@ -1,7 +1,7 @@
 FactoryGirl.define do
 
-  factory :repository_svn, :class => 'Repository::Subversion' do |repository|
-    repository.is_default  false
+  factory :repository_svn, :class => 'Repository::Subversion' do |f|
+    f.is_default  false
   end
 
 end

Diff for: spec/factories/role.rb

@@ -1,11 +1,11 @@
 FactoryGirl.define do
 
-  factory :role do |role|
-    role.name    "Manager"
-    role.builtin 0
-    role.issues_visibility "all"
-    role.position 1
-    role.permissions  [
+  factory :role do |f|
+    f.name    "Manager"
+    f.builtin 0
+    f.issues_visibility "all"
+    f.position 1
+    f.permissions  [
       :add_project,
       :edit_project,
       :close_project,

Diff for: spec/factories/user.rb

@@ -1,13 +1,13 @@
 FactoryGirl.define do
 
-  factory :user do |user|
-    user.sequence(:login)     { |n| "user#{n}" }
-    user.sequence(:firstname) { |n| "User#{n}" }
-    user.sequence(:lastname)  { |n| "Test#{n}" }
-    user.sequence(:mail)      { |n| "user#{n}@awesome.com" }
-    user.language             "fr"
-    user.hashed_password      "66eb4812e268747f89ec309178e2ea50410653fb"
-    user.salt                 "5abd4e59ac0d483daf2f68d3b6544ff3"
+  factory :user do |f|
+    f.sequence(:login)     { |n| "user#{n}" }
+    f.sequence(:firstname) { |n| "User#{n}" }
+    f.sequence(:lastname)  { |n| "Test#{n}" }
+    f.sequence(:mail)      { |n| "user#{n}@awesome.com" }
+    f.language             "fr"
+    f.hashed_password      "66eb4812e268747f89ec309178e2ea50410653fb"
+    f.salt                 "5abd4e59ac0d483daf2f68d3b6544ff3"
   end
 
 end

Diff for: spec/models/gitolite_public_key_spec.rb

@@ -30,8 +30,8 @@ def create_ssh_key(opts = {})
 
 
   describe "Valid SSH key build" do
-    before do
-      @ssh_key = build_ssh_key(:user_id => @user1.id)
+    before(:each) do
+      @ssh_key = build(:gitolite_public_key)
     end
 
     subject { @ssh_key }
@@ -208,7 +208,7 @@ def create_ssh_key(opts = {})
 
       ssh_keys.each do |valid_key|
         it "should be valid" do
-          expect(build_ssh_key(:user_id => @user1.id, :key => valid_key)).to be_valid
+          expect(build(:gitolite_public_key, :key => valid_key)).to be_valid
         end
       end
     end
@@ -258,10 +258,10 @@ def create_ssh_key(opts = {})
 
   context "when many keys are saved" do
     before do
-      create_ssh_key(:user_id => @user1.id, :title => 'active1', key: SSH_KEY_1, :key_type => 1)
-      create_ssh_key(:user_id => @user1.id, :title => 'active2', key: SSH_KEY_2, :key_type => 1)
-      create_ssh_key(:user_id => @user2.id, :title => 'active3', key: SSH_KEY_3)
-      create_ssh_key(:user_id => @user2.id, :title => 'active4', key: SSH_KEY_4)
+      create_ssh_key(:user => @user1, :title => 'active1', key: SSH_KEY_1, :key_type => 1)
+      create_ssh_key(:user => @user1, :title => 'active2', key: SSH_KEY_2, :key_type => 1)
+      create_ssh_key(:user => @user2, :title => 'active3', key: SSH_KEY_3)
+      create_ssh_key(:user => @user2, :title => 'active4', key: SSH_KEY_4)
     end
 
     it "should have 8 keys" do

Diff for: spec/models/project_spec.rb

@@ -3,12 +3,12 @@
 describe Project do
 
   before(:all) do
-    @project    = FactoryGirl.create(:project)
+    @project    = create(:project)
 
-    @git_repo_1 = FactoryGirl.create(:repository_git, :project_id => @project.id, :is_default => true)
-    @git_repo_2 = FactoryGirl.create(:repository_git, :project_id => @project.id, :identifier => 'git-repo-test')
+    @git_repo_1 = create(:repository_git, :project => @project, :is_default => true)
+    @git_repo_2 = create(:repository_git, :project => @project, :identifier => 'git-repo-test')
 
-    @svn_repo_1 = FactoryGirl.create(:repository_svn, :project_id => @project.id, :identifier => 'svn-repo-test', :url => 'http://svn-repo-test')
+    @svn_repo_1 = create(:repository_svn, :project => @project, :identifier => 'svn-repo-test', :url => 'http://svn-repo-test')
   end
 
   subject { @project }
@@ -26,11 +26,11 @@
   end
 
   it "should not match existing repository identifier" do
-    expect(FactoryGirl.build(:project, :identifier => 'git-repo-test')).to be_invalid
+    expect(build(:project, :identifier => 'git-repo-test')).to be_invalid
   end
 
   it "should not match Gitolite Admin repository identifier" do
-    expect(FactoryGirl.build(:project, :identifier => 'gitolite-admin')).to be_invalid
+    expect(build(:project, :identifier => 'gitolite-admin')).to be_invalid
   end
 
 end

Diff for: spec/models/repository_deployment_credential_spec.rb

@@ -6,27 +6,23 @@
   USER_KEY   = 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC5+JfM82k03J98GWL6ghJ4TYM8DbvDnVh1s1rUDNlM/1U5rwbgXHOR4xV3lulgYEYRtYeMoL3rt4ZpEyXWkOreOVsUlkW66SZJR5aGVTNJOLX7HruEDqj7RWlt0u0MH6DgBVAJimQrxYN50jYD4XnDUjb/qv55EhPvbJ3jcAb3zuyRXMKZYGNVzVFLUagbvVaOwR23csWSLDTsAEI9JzaxMKvCNRwk3jFepiCovXbw+g0iyvJdp0+AJpC57ZupyxHeX9J2oz7im2UaHHqLa2qUZL6c4PNV/D2p0Bts4Tcnn3OFPL90RF/ao0tjiUFxM3ti8pRHOqRcZHcOgIhKiaLX nicolas@tchoum'
 
   before(:all) do
-    @project    = FactoryGirl.create(:project)
-    @repository = FactoryGirl.create(:repository_git, :project_id => @project.id)
-
-    users = FactoryGirl.create_list(:user, 2)
+    users = create_list(:user, 2)
     @user1 = users[0]
     @user2 = users[1]
 
-    @deploy_key = FactoryGirl.create(:gitolite_public_key, :user_id => @user1.id, :key_type => 1, :title => 'foo1', :key => DEPLOY_KEY)
-    @user_key   = FactoryGirl.create(:gitolite_public_key, :user_id => @user1.id, :key_type => 0, :title => 'foo2', :key => USER_KEY)
+    @deploy_key = create(:gitolite_public_key, :user => @user1, :key_type => 1, :title => 'foo1', :key => DEPLOY_KEY)
+    @user_key   = create(:gitolite_public_key, :user => @user1, :key_type => 0, :title => 'foo2', :key => USER_KEY)
   end
 
 
   def build_deployment_credential(opts = {})
-    opts = opts.merge(:repository_id => @repository.id)
-    FactoryGirl.build(:repository_deployment_credential, opts)
+    build(:repository_deployment_credential, opts)
   end
 
 
   describe "Valid RepositoryDeploymentCredential creation" do
-    before do
-      @deployment_credential = build_deployment_credential(:user_id => @user1.id, :gitolite_public_key_id => @deploy_key.id)
+    before(:each) do
+      @deployment_credential = build_deployment_credential(:user => @user1, :gitolite_public_key => @deploy_key)
     end
 
     subject { @deployment_credential }
@@ -68,13 +64,13 @@ def build_deployment_credential(opts = {})
 
   context "when key is not a deployment key" do
     it 'should not be valid' do
-      expect(build_deployment_credential(:user_id => @user1.id, :gitolite_public_key_id => @user_key.id)).not_to be_valid
+      expect(build_deployment_credential(:user => @user1, :gitolite_public_key => @user_key)).not_to be_valid
     end
   end
 
   context "when user id is not the owner of deployment key" do
     it 'should not be valid' do
-      expect(build_deployment_credential(:user_id => @user2.id, :gitolite_public_key_id => @user_key.id)).not_to be_valid
+      expect(build_deployment_credential(:user => @user2, :gitolite_public_key => @user_key)).not_to be_valid
     end
   end
 

Diff for: spec/models/repository_git_config_key_spec.rb

@@ -2,21 +2,9 @@
 
 describe RepositoryGitConfigKey do
 
-  before(:all) do
-    @project    = FactoryGirl.create(:project)
-    @repository = FactoryGirl.create(:repository_git, :project_id => @project.id)
-  end
-
-
-  def build_git_config_key(opts = {})
-    opts = opts.merge(:repository_id => @repository.id)
-    FactoryGirl.build(:repository_git_config_key, opts)
-  end
-
-
   describe "Valid RepositoryGitConfigKey creation" do
-    before do
-      @git_config_key = build_git_config_key
+    before(:each) do
+      @git_config_key = build(:repository_git_config_key)
     end
 
     subject { @git_config_key }

Diff for: spec/models/repository_git_extra_spec.rb

@@ -2,13 +2,9 @@
 
 describe RepositoryGitExtra do
 
-  def build_git_extra(opts = {})
-    FactoryGirl.build(:repository_git_extra, opts)
-  end
-
   describe "Valid RepositoryGitExtra creation" do
     before do
-      @git_extra = build_git_extra
+      @git_extra = build(:repository_git_extra)
     end
 
     subject { @git_extra }
@@ -24,14 +20,14 @@ def build_git_extra(opts = {})
     it { should belong_to(:repository) }
 
     ## Validations
-    it { should_not be_valid }
+    it { should be_valid }
 
     it { should validate_presence_of(:repository_id) }
     it { should validate_presence_of(:git_http) }
     it { should validate_presence_of(:default_branch) }
     it { should validate_presence_of(:key) }
 
-    # it { should validate_uniqueness_of(:repository_id) }
+    it { should validate_uniqueness_of(:repository_id) }
 
     it { should validate_numericality_of(:git_http) }
 

Diff for: spec/models/repository_git_notification_spec.rb

@@ -2,23 +2,13 @@
 
 describe RepositoryGitNotification do
 
-  before(:all) do
-    @project    = FactoryGirl.create(:project)
-    @repository = FactoryGirl.create(:repository_git, :project_id => @project.id)
-  end
-
   VALID_MAIL   = [ '[email protected]', '[email protected]', '[email protected]', '[email protected]' ]
   INVALID_MAIL = [ 'user@foo,com', 'user_at_foo.org', 'example.user@foo.', 'foo@bar_baz.com', 'foo@bar+baz.com', '[email protected]' ]
 
-  def build_git_notification(opts = {})
-    opts = opts.merge(:repository_id => @repository.id)
-    FactoryGirl.build(:repository_git_notification, opts)
-  end
-
 
   describe "Valid RepositoryGitNotification creation" do
-    before do
-      @git_notification = build_git_notification
+    before(:each) do
+      @git_notification = build(:repository_git_notification)
     end
 
     subject { @git_notification }