Remove backward compatibility of factories.

spec/requests/api/users_spec.rb

@@ -3,9 +3,9 @@ require 'spec_helper'
 describe Gitlab::API do
   include ApiHelpers
-  let(:user)  { Factory :user }
-  let(:admin) { Factory :admin }
-  let(:key)   { Factory :key, user: user }
+  let(:user)  { create(:user) }
+  let(:admin) { create(:admin) }
+  let(:key)   { create(:key, user: user) }
   describe "GET /users" do
     context "when unauthenticated" do
@@ -43,12 +43,12 @@ describe Gitlab::API do
     it "should create user" do
       expect {
-        post api("/users", admin), Factory.attributes(:user, projects_limit: 3)
+        post api("/users", admin), attributes_for(:user, projects_limit: 3)
       }.to change { User.count }.by(1)
     end
     it "shouldn't available for non admin users" do
-      post api("/users", user), Factory.attributes(:user)
+      post api("/users", user), attributes_for(:user)
       response.status.should == 403
     end
   end
@@ -103,7 +103,7 @@ describe Gitlab::API do
     end
     it "should create ssh key" do
-      key_attrs = Factory.attributes :key
+      key_attrs = attributes_for :key
       expect {
         post api("/user/keys", user), key_attrs
       }.to change{ user.keys.count }.by(1)

spec/requests/atom/dashboard_issues_spec.rb

@@ -2,11 +2,11 @@ require 'spec_helper'
 describe "Dashboard Issues Feed" do
   describe "GET /issues" do
-    let!(:user)     { Factory :user }
-    let!(:project1) { Factory :project }
-    let!(:project2) { Factory :project }
-    let!(:issue1)   { Factory :issue, author: user, assignee: user, project: project1 }
-    let!(:issue2)   { Factory :issue, author: user, assignee: user, project: project2 }
+    let!(:user)     { create(:user) }
+    let!(:project1) { create(:project) }
+    let!(:project2) { create(:project) }
+    let!(:issue1)   { create(:issue, author: user, assignee: user, project: project1) }
+    let!(:issue2)   { create(:issue, author: user, assignee: user, project: project2) }
     describe "atom feed" do
       it "should render atom feed via private token" do

spec/requests/atom/dashboard_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 describe "Dashboard Feed" do
   describe "GET /" do
-    let!(:user) { Factory :user }
+    let!(:user) { create(:user) }
     context "projects atom feed via private token" do
       it "should render projects atom feed" do

spec/requests/atom/issues_spec.rb

@@ -2,9 +2,9 @@ require 'spec_helper'
 describe "Issues Feed" do
   describe "GET /issues" do
-    let!(:user)     { Factory :user }
-    let!(:project)  { Factory :project, owner: user }
-    let!(:issue)    { Factory :issue, author: user, project: project }
+    let!(:user)     { create(:user) }
+    let!(:project)  { create(:project, owner: user) }
+    let!(:issue)    { create(:issue, author: user, project: project) }
     before { project.add_access(user, :read, :write) }

spec/requests/gitlab_flavored_markdown_spec.rb

 require 'spec_helper'
 describe "Gitlab Flavored Markdown" do
-  let(:project) { Factory :project }
-  let(:issue) { Factory :issue, project: project }
-  let(:merge_request) { Factory :merge_request, project: project }
+  let(:project) { create(:project) }
+  let(:issue) { create(:issue, project: project) }
+  let(:merge_request) { create(:merge_request, project: project) }
   let(:fred) do
-      u = Factory :user, name: "fred"
+      u = create(:user, name: "fred")
       project.users << u
       u
   end
@@ -84,16 +84,16 @@ describe "Gitlab Flavored Markdown" do
   describe "for issues" do
     before do
-      @other_issue = Factory :issue,
+      @other_issue = create(:issue,
+                            author: @user,
+                            assignee: @user,
+                            project: project)
+      @issue = create(:issue,
                       author: @user,
                       assignee: @user,
-                      project: project
-      @issue = Factory :issue,
-                author: @user,
-                assignee: @user,
-                project: project,
-                title: "fix ##{@other_issue.id}",
-                description: "ask @#{fred.name} for details"
+                      project: project,
+                      title: "fix ##{@other_issue.id}",
+                      description: "ask @#{fred.name} for details")
     end
     it "should render subject in issues#index" do
@@ -118,9 +118,9 @@ describe "Gitlab Flavored Markdown" do
   describe "for merge requests" do
     before do
-      @merge_request = Factory :merge_request,
-                        project: project,
-                        title: "fix ##{issue.id}"
+      @merge_request = create(:merge_request,
+                              project: project,
+                              title: "fix ##{issue.id}")
     end
     it "should render title in merge_requests#index" do
@@ -139,10 +139,10 @@ describe "Gitlab Flavored Markdown" do
   describe "for milestones" do
     before do
-      @milestone = Factory :milestone,
-                    project: project,
-                    title: "fix ##{issue.id}",
-                    description: "ask @#{fred.name} for details"
+      @milestone = create(:milestone,
+                          project: project,
+                          title: "fix ##{issue.id}",
+                          description: "ask @#{fred.name} for details")
     end
     it "should render title in milestones#index" do

spec/requests/issues_spec.rb

 require 'spec_helper'
 describe "Issues" do
-  let(:project) { Factory :project }
+  let(:project) { create(:project) }
   before do
     login_as :user
-    @user2 = Factory :user
+    @user2 = create(:user)
     project.add_access(@user, :read, :write)
     project.add_access(@user2, :read, :write)
@@ -13,10 +13,10 @@ describe "Issues" do
   describe "Edit issue", js: true do
     before do
-      @issue = Factory :issue,
-        author: @user,
-        assignee: @user,
-        project: project
+      @issue = create(:issue,
+                      author: @user,
+                      assignee: @user,
+                      project: project)
       visit project_issues_path(project)
       click_link "Edit"
     end
@@ -46,11 +46,11 @@ describe "Issues" do
   describe "Search issue", js: true do
     before do
       ['foobar', 'foobar2', 'gitlab'].each do |title|
-        @issue = Factory :issue,
-          author: @user,
-          assignee: @user,
-          project: project,
-          title: title
+        @issue = create(:issue,
+                        author: @user,
+                        assignee: @user,
+                        project: project,
+                        title: title)
         @issue.save
       end
     end
@@ -93,15 +93,15 @@ describe "Issues" do
   describe "Filter issue" do
     before do
       ['foobar', 'barbaz', 'gitlab'].each do |title|
-        @issue = Factory :issue,
-          author: @user,
-          assignee: @user,
-          project: project,
-          title: title
+        @issue = create(:issue,
+                        author: @user,
+                        assignee: @user,
+                        project: project,
+                        title: title)
       end
       @issue = Issue.first
-      @issue.milestone = Factory(:milestone, project: project)
+      @issue.milestone = create(:milestone, project: project)
       @issue.assignee = nil
       @issue.save
     end

spec/requests/projects_deploy_keys_spec.rb

 require 'spec_helper'
 describe "Projects", "DeployKeys" do
-  let(:project) { Factory :project }
+  let(:project) { create(:project) }
   before do
     login_as :user
@@ -10,7 +10,7 @@ describe "Projects", "DeployKeys" do
   describe "GET /keys" do
     before do
-      @key = Factory :key, project: project
+      @key = create(:key, project: project)
       visit project_deploy_keys_path(project)
     end
@@ -57,7 +57,7 @@ describe "Projects", "DeployKeys" do
   describe "Show page" do
     before do
-      @key = Factory :key, project: project
+      @key = create(:key, project: project)
       visit project_deploy_key_path(project, @key)
     end

spec/requests/projects_spec.rb

@@ -6,7 +6,7 @@ describe "Projects" do
   describe 'GET /project/new' do
     it "should work autocomplete", :js => true do
       visit new_project_path
-      
+
       fill_in 'project_name', with: 'Awesome'
       find("#project_path").value.should == 'awesome'
       find("#project_code").value.should == 'awesome'
@@ -15,7 +15,7 @@ describe "Projects" do
   describe "GET /projects/show" do
     before do
-      @project = Factory :project, owner: @user
+      @project = create(:project, owner: @user)
       @project.add_access(@user, :read)
       visit project_path(@project)
@@ -28,7 +28,7 @@ describe "Projects" do
   describe "GET /projects/:id/edit" do
     before do
-      @project = Factory :project
+      @project = create(:project)
       @project.add_access(@user, :admin, :read)
       visit edit_project_path(@project)
@@ -47,7 +47,7 @@ describe "Projects" do
   describe "PUT /projects/:id" do
     before do
-      @project = Factory :project, owner: @user
+      @project = create(:project, owner: @user)
       @project.add_access(@user, :admin, :read)
       visit edit_project_path(@project)
@@ -69,7 +69,7 @@ describe "Projects" do
   describe "DELETE /projects/:id" do
     before do
-      @project = Factory :project
+      @project = create(:project)
       @project.add_access(@user, :read, :admin)
       visit edit_project_path(@project)
     end

spec/requests/search_spec.rb

@@ -3,14 +3,14 @@ require 'spec_helper'
 describe "Search" do
   before do
     login_as :user
-    @project = Factory :project
+    @project = create(:project)
     @project.add_access(@user, :read)
     visit search_path
     fill_in "search", with: @project.name[0..3]
     click_button "Search"
   end
-  it "should show project in search results" do 
+  it "should show project in search results" do
     page.should have_content @project.name
   end
 end

spec/requests/security/profile_access_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "Users Security" do
   describe "Project" do
     before do
-      @u1 = Factory :user
+      @u1 = create(:user)
     end
     describe "GET /login" do

spec/requests/snippets_spec.rb

 require 'spec_helper'
 describe "Snippets" do
-  let(:project) { Factory :project }
+  let(:project) { create(:project) }
   before do
     login_as :user
@@ -10,9 +10,9 @@ describe "Snippets" do
   describe "GET /snippets" do
     before do
-      @snippet = Factory :snippet,
-        author: @user,
-        project: project
+      @snippet = create(:snippet,
+                        author: @user,
+                        project: project)
       visit project_snippets_path(project)
     end
@@ -68,9 +68,9 @@ describe "Snippets" do
   describe "Edit snippet" do
     before do
-      @snippet = Factory :snippet,
-        author: @user,
-        project: project
+      @snippet = create(:snippet,
+                        author: @user,
+                        project: project)
       visit project_snippet_path(project, @snippet)
       click_link "Edit"
     end

spec/support/login_helpers.rb

@@ -3,7 +3,7 @@ module LoginHelpers
   #
   # role - User role (e.g., :admin, :user)
   def login_as(role)
-    @user = Factory(role)
+    @user = create(role)
     login_with(@user)
   end

spec/support/matchers.rb

@@ -59,9 +59,9 @@ module UrlAccess
   def emulate_user(user)
     user = case user
-           when :user then Factory(:user)
+           when :user then create(:user)
            when :visitor then nil
-           when :admin then Factory(:admin)
+           when :admin then create(:admin)
            else user
            end
     login_with(user) if user

spec/workers/post_receive_spec.rb

@@ -9,8 +9,8 @@ describe PostReceive do
   end
   context "web hook" do
-    let(:project) { Factory.create(:project) }
-    let(:key) { Factory.create(:key, user: project.owner) }
+    let(:project) { create(:project) }
+    let(:key) { create(:key, user: project.owner) }
     let(:key_id) { key.identifier }
     it "fetches the correct project" do