From 67a182d6cad5dbc62261614ae7246ccb5c120910 Mon Sep 17 00:00:00 2001
From: Marcin Kulik <marcin.kulik@gmail.com>
Date: Sat, 1 Dec 2012 18:45:06 +0100
Subject: [PATCH] Use new FactoryGirl syntax exclusively

---
 spec/controllers/api/comments_controller_spec.rb |  6 +++---
 spec/controllers/home_controller_spec.rb         |  4 ++--
 spec/controllers/sessions_controller_spec.rb     |  2 +-
 spec/controllers/user_tokens_controller_spec.rb  |  2 +-
 spec/models/asciicast_spec.rb                    | 10 +++++-----
 spec/models/user_spec.rb                         |  6 +++---
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/spec/controllers/api/comments_controller_spec.rb b/spec/controllers/api/comments_controller_spec.rb
index b9ff9f8..db0ddc7 100644
--- a/spec/controllers/api/comments_controller_spec.rb
+++ b/spec/controllers/api/comments_controller_spec.rb
@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe Api::CommentsController do
 
-  let(:user)      { Factory(:user) }
-  let(:asciicast) { Factory(:asciicast) }
+  let(:user)      { FactoryGirl.create(:user) }
+  let(:asciicast) { FactoryGirl.create(:asciicast) }
 
   before do
     login_as(user)
@@ -83,7 +83,7 @@ describe Api::CommentsController do
     end
 
     context "when user is not creator of comment" do
-      let(:other_user) { Factory(:user) }
+      let(:other_user) { FactoryGirl.create(:user) }
 
       before do
         comment.stub(:user).and_return(other_user)
diff --git a/spec/controllers/home_controller_spec.rb b/spec/controllers/home_controller_spec.rb
index 355e6f5..07cd70a 100644
--- a/spec/controllers/home_controller_spec.rb
+++ b/spec/controllers/home_controller_spec.rb
@@ -5,7 +5,7 @@ describe HomeController do
   describe "GET 'show'" do
     describe 'when there is at least one featured cast' do
       before do
-        Factory(:asciicast, :featured => true)
+        FactoryGirl.create(:asciicast, :featured => true)
       end
 
       it "returns http success" do
@@ -16,7 +16,7 @@ describe HomeController do
 
     describe 'when there is no featured cast but any cast exists' do
       before do
-        Factory(:asciicast, :featured => false)
+        FactoryGirl.create(:asciicast, :featured => false)
       end
 
       it "returns http success" do
diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb
index e2f4085..e1be195 100644
--- a/spec/controllers/sessions_controller_spec.rb
+++ b/spec/controllers/sessions_controller_spec.rb
@@ -19,7 +19,7 @@ describe SessionsController do
 
     context "user exists" do
       before do
-        Factory(:user, :provider => provider, :uid => uid)
+        FactoryGirl.create(:user, :provider => provider, :uid => uid)
         post :create
       end
 
diff --git a/spec/controllers/user_tokens_controller_spec.rb b/spec/controllers/user_tokens_controller_spec.rb
index bba93b7..65002bf 100644
--- a/spec/controllers/user_tokens_controller_spec.rb
+++ b/spec/controllers/user_tokens_controller_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe UserTokensController do
   describe '#create' do
-    let(:user) { Factory(:user) }
+    let(:user) { FactoryGirl.create(:user) }
     let(:user_token) { FactoryGirl.build(:user_token, :user => nil) }
 
     before do
diff --git a/spec/models/asciicast_spec.rb b/spec/models/asciicast_spec.rb
index 3c83f6d..d4095c8 100644
--- a/spec/models/asciicast_spec.rb
+++ b/spec/models/asciicast_spec.rb
@@ -6,10 +6,10 @@ describe Asciicast do
   end
 
   describe '.assign_user' do
-    let(:user) { Factory(:user) }
+    let(:user) { FactoryGirl.create(:user) }
     let(:token) { 'token' }
     let!(:asciicast) do
-      Factory(:asciicast, :user => nil, :user_token => token)
+      FactoryGirl.create(:asciicast, :user => nil, :user_token => token)
     end
 
     subject { Asciicast.assign_user(token, user) }
@@ -47,13 +47,13 @@ describe Asciicast do
   end
 
   describe '#assign_user' do
-    let(:user) { Factory(:user) }
+    let(:user) { FactoryGirl.create(:user) }
     let(:asciicast) do
-      Factory(:asciicast, :user => nil, :user_token => user_token)
+      FactoryGirl.create(:asciicast, :user => nil, :user_token => user_token)
     end
 
     context 'when user exists with given token' do
-      let(:user_token) { Factory(:user_token, :user => user).token }
+      let(:user_token) { FactoryGirl.create(:user_token, :user => user).token }
 
       it 'assigns user and resets user_token' do
         asciicast.assign_user
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index f7f8ce6..ee70ecf 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -9,7 +9,7 @@ describe User do
   end
 
   describe "validation" do
-    let(:user) { Factory(:user) }
+    let(:user) { FactoryGirl.create(:user) }
 
     it "validates nickname uniqueness" do
       new_user = FactoryGirl.build(:user)
@@ -65,7 +65,7 @@ describe User do
     end
 
     context "when nickname is taken" do
-      let!(:user) { Factory(:user) }
+      let!(:user) { FactoryGirl.create(:user) }
       let(:nickname) { user.nickname }
 
       it "doesn't create user" do
@@ -91,7 +91,7 @@ describe User do
     end
 
     context "when user doesn't have given token" do
-      let(:existing_token) { Factory(:user_token, :user => user) }
+      let(:existing_token) { FactoryGirl.create(:user_token, :user => user) }
       let(:token) { existing_token.token }
 
       it 'returns existing UserToken' do