cure this test suite's FactoryGirl-itis

features/step_definitions/clearance/clearance_steps.rb

@@ -35,11 +35,11 @@
 end
 
 Given /^(?:I am|I have|I) signed up (?:as|with) "(.*)"$/ do |email|
-  @me = FactoryGirl.create(:user, :email => email)
+  @me = create(:user, :email => email)
 end
 
 Given /^a user "([^"]*)" exists without a salt, remember token, or password$/ do |email|
-  @me = user = FactoryGirl.create(:user, :email => email)
+  @me = user = create(:user, :email => email)
   sql  = "update users set salt = NULL, encrypted_password = NULL, remember_token = NULL where id = #{user.id}"
   ActiveRecord::Base.connection.update(sql)
 end

features/step_definitions/dependency_steps.rb

@@ -1,10 +1,10 @@
 And /the following gem dependencies exist:/ do |table|
   table.hashes.each do |hash|
     version        = Version.find_by_full_name!(hash['Version'])
-    rubygem        = FactoryGirl.create(:rubygem, :name => hash['Rubygem'])
+    rubygem        = create(:rubygem, :name => hash['Rubygem'])
     gem_dependency = Gem::Dependency.new(rubygem.name, hash['Requirements'])
 
-    FactoryGirl.create(:dependency, :version => version, :rubygem => rubygem, :gem_dependency => gem_dependency)
+    create(:dependency, :version => version, :rubygem => rubygem, :gem_dependency => gem_dependency)
   end
 end
 

features/step_definitions/gem_steps.rb

@@ -11,8 +11,8 @@
 end
 
 Given /^a rubygem exists with name "([^\"]*)" and version "([^\"]*)"$/ do |name, version_number|
-  rubygem = FactoryGirl.create(:rubygem, :name => name)
-  FactoryGirl.create(:version, :rubygem => rubygem, :number => version_number)
+  rubygem = create(:rubygem, :name => name)
+  create(:version, :rubygem => rubygem, :number => version_number)
 end
 
 Given /^I have a gem "([^\"]*)" with version "([^\"]*)" and homepage "([^\"]*)"$/ do |name, version, homepage|
@@ -46,8 +46,8 @@
 Given 'the following rubygems exist for "$email":' do |email, table|
   user = User.find_by_email! email
   table.hashes.each do |row|
-    rubygem = FactoryGirl.create(:rubygem, :name => row['name'], :downloads => row['downloads'])
-    version = FactoryGirl.create(:version, :rubygem => rubygem)
+    rubygem = create(:rubygem, :name => row['name'], :downloads => row['downloads'])
+    version = create(:version, :rubygem => rubygem)
     row['downloads'].to_i.times { Download.incr(rubygem.name, version.full_name) }
 
     rubygem.ownerships.create :user => user

features/support/gemcutter.rb

@@ -6,6 +6,7 @@
 TEST_DIR = File.join('/', 'tmp', 'gemcutter')
 
 require 'factory_girl/step_definitions'
+World(FactoryGirl::Syntax::Methods)
 
 Before do
   WebMock.reset!

test/functional/api/v1/activities_controller_test.rb

@@ -20,15 +20,15 @@ def should_return_just_updated_gems(gems)
   context "No signed in-user" do
     context "On GET to latest" do
       setup do
-        @rubygem_1 = FactoryGirl.create(:rubygem)
-        @version_1 = FactoryGirl.create(:version, :rubygem => @rubygem_1)
-        @version_2 = FactoryGirl.create(:version, :rubygem => @rubygem_1)
+        @rubygem_1 = create(:rubygem)
+        @version_1 = create(:version, :rubygem => @rubygem_1)
+        @version_2 = create(:version, :rubygem => @rubygem_1)
 
-        @rubygem_2 = FactoryGirl.create(:rubygem)
-        @version_3 = FactoryGirl.create(:version, :rubygem => @rubygem_2)
+        @rubygem_2 = create(:rubygem)
+        @version_3 = create(:version, :rubygem => @rubygem_2)
 
-        @rubygem_3 = FactoryGirl.create(:rubygem)
-        @version_4 = FactoryGirl.create(:version, :rubygem => @rubygem_3)
+        @rubygem_3 = create(:rubygem)
+        @version_4 = create(:version, :rubygem => @rubygem_3)
 
         stub(Rubygem).latest(50){ [@rubygem_2, @rubygem_3] }
       end
@@ -52,15 +52,15 @@ def should_return_just_updated_gems(gems)
 
     context "On GET to just_updated" do
       setup do
-        @rubygem_1 = FactoryGirl.create(:rubygem)
-        @version_1 = FactoryGirl.create(:version, :rubygem => @rubygem_1)
-        @version_2 = FactoryGirl.create(:version, :rubygem => @rubygem_1)
+        @rubygem_1 = create(:rubygem)
+        @version_1 = create(:version, :rubygem => @rubygem_1)
+        @version_2 = create(:version, :rubygem => @rubygem_1)
 
-        @rubygem_2 = FactoryGirl.create(:rubygem)
-        @version_3 = FactoryGirl.create(:version, :rubygem => @rubygem_2)
+        @rubygem_2 = create(:rubygem)
+        @version_3 = create(:version, :rubygem => @rubygem_2)
 
-        @rubygem_3 = FactoryGirl.create(:rubygem)
-        @version_4 = FactoryGirl.create(:version, :rubygem => @rubygem_3)
+        @rubygem_3 = create(:rubygem)
+        @version_4 = create(:version, :rubygem => @rubygem_3)
 
         stub(Version).just_updated(50){ [@version_2, @version_3, @version_4] }
       end

test/functional/api/v1/api_keys_controller_test.rb

@@ -28,7 +28,7 @@ def authorize_with(str)
 
   context "on GET to show with bad credentials" do
     setup do
-      @user = FactoryGirl.create(:user)
+      @user = create(:user)
       authorize_with("bad:creds")
       get :show
     end
@@ -41,7 +41,7 @@ def authorize_with(str)
   # this endpoint is used by rubygems
   context "on GET to show with TEXT and with confirmed user" do
     setup do
-      @user = FactoryGirl.create(:user)
+      @user = create(:user)
       authorize_with("#{@user.email}:#{@user.password}")
       get :show, :format => 'text'
     end
@@ -54,7 +54,7 @@ def authorize_with(str)
   def self.should_respond_to(format, to_meth = :to_s)
     context "with #{format.to_s.upcase} and with confirmed user" do
       setup do
-        @user = FactoryGirl.create(:user)
+        @user = create(:user)
         authorize_with("#{@user.email}:#{@user.password}")
         get :show, :format => format
       end
@@ -84,7 +84,7 @@ def self.should_respond_to(format, to_meth = :to_s)
 
   context "on PUT to reset with signed in user" do
     setup do
-      @user = FactoryGirl.create(:user)
+      @user = create(:user)
       sign_in_as(@user)
     end
     should "reset the user's api key" do

test/functional/api/v1/dependencies_controller_test.rb

@@ -3,8 +3,8 @@
 class Api::V1::DependenciesControllerTest < ActionController::TestCase
   context "on GET to index" do
     setup do
-      @versions = [FactoryGirl.create(:version), FactoryGirl.create(:version)].each do |version|
-        FactoryGirl.create(:dependency, :version => version)
+      @versions = [create(:version), create(:version)].each do |version|
+        create(:dependency, :version => version)
       end
       get :index, :gems => @versions.map(&:rubygem).map(&:name).join(',')
     end

test/functional/api/v1/downloads_controller_test.rb

@@ -65,9 +65,9 @@ def self.should_respond_to(format, to_meth = :to_s)
 
   context "on GET to show" do
     setup do
-      rubygem  = FactoryGirl.create(:rubygem_with_downloads)
-      @version1 = FactoryGirl.create(:version, :rubygem => rubygem, :number => '1.0.0')
-      @version2 = FactoryGirl.create(:version, :rubygem => rubygem, :number => '2.0.0')
+      rubygem  = create(:rubygem_with_downloads)
+      @version1 = create(:version, :rubygem => rubygem, :number => '1.0.0')
+      @version2 = create(:version, :rubygem => rubygem, :number => '2.0.0')
 
       Download.incr(rubygem.name, @version1.full_name)
       Download.incr(rubygem.name, @version2.full_name)
@@ -128,15 +128,15 @@ def self.should_respond_to(format)
 
   context "On GET to top" do
     setup do
-      @rubygem_1 = FactoryGirl.create(:rubygem)
-      @version_1 = FactoryGirl.create(:version, :rubygem => @rubygem_1)
-      @version_2 = FactoryGirl.create(:version, :rubygem => @rubygem_1)
+      @rubygem_1 = create(:rubygem)
+      @version_1 = create(:version, :rubygem => @rubygem_1)
+      @version_2 = create(:version, :rubygem => @rubygem_1)
 
-      @rubygem_2 = FactoryGirl.create(:rubygem)
-      @version_3 = FactoryGirl.create(:version, :rubygem => @rubygem_2)
+      @rubygem_2 = create(:rubygem)
+      @version_3 = create(:version, :rubygem => @rubygem_2)
 
-      @rubygem_3 = FactoryGirl.create(:rubygem)
-      @version_4 = FactoryGirl.create(:version, :rubygem => @rubygem_3)
+      @rubygem_3 = create(:rubygem)
+      @version_4 = create(:version, :rubygem => @rubygem_3)
 
       3.times { Download.incr(@rubygem_1.name, @version_1.full_name) }
       2.times { Download.incr(@rubygem_1.name, @version_2.full_name) }
@@ -160,15 +160,15 @@ def self.should_respond_to(format)
 
   context "On GET to all" do
     setup do
-      @rubygem_1 = FactoryGirl.create(:rubygem)
-      @version_1 = FactoryGirl.create(:version, :rubygem => @rubygem_1)
-      @version_2 = FactoryGirl.create(:version, :rubygem => @rubygem_1)
+      @rubygem_1 = create(:rubygem)
+      @version_1 = create(:version, :rubygem => @rubygem_1)
+      @version_2 = create(:version, :rubygem => @rubygem_1)
 
-      @rubygem_2 = FactoryGirl.create(:rubygem)
-      @version_3 = FactoryGirl.create(:version, :rubygem => @rubygem_2)
+      @rubygem_2 = create(:rubygem)
+      @version_3 = create(:version, :rubygem => @rubygem_2)
 
-      @rubygem_3 = FactoryGirl.create(:rubygem)
-      @version_4 = FactoryGirl.create(:version, :rubygem => @rubygem_3)
+      @rubygem_3 = create(:rubygem)
+      @version_4 = create(:version, :rubygem => @rubygem_3)
 
       3.times { Download.incr(@rubygem_1.name, @version_1.full_name) }
       2.times { Download.incr(@rubygem_1.name, @version_2.full_name) }

test/functional/api/v1/owners_controller_test.rb

@@ -12,8 +12,8 @@ def self.should_respond_to(format)
 
     context "on GET to show with #{format.to_s.upcase}" do
       setup do
-        @rubygem = FactoryGirl.create(:rubygem)
-        @user = FactoryGirl.create(:user)
+        @rubygem = create(:rubygem)
+        @user = create(:user)
         @rubygem.ownerships.create(:user => @user)
 
         @request.env["HTTP_AUTHORIZATION"] = @user.api_key