summaryrefslogtreecommitdiff
path: root/spec/controllers
diff options
context:
space:
mode:
authormo k <mo@mokhan.ca>2012-05-22 07:57:54 -0600
committermo k <mo@mokhan.ca>2012-05-22 07:57:54 -0600
commitf6b46ba7edffd80cee98abe46ba089ae4e4d733b (patch)
tree8cc3afbed9875a55ecf27023e99ce60262888ad9 /spec/controllers
parentc245b717b187e149b0f93ee924f86b3ef6854342 (diff)
trying to figure out why the specs are failing after adding the website validation.
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/creations_controller_spec.rb5
-rw-r--r--spec/controllers/photos_controller_spec.rb4
2 files changed, 5 insertions, 4 deletions
diff --git a/spec/controllers/creations_controller_spec.rb b/spec/controllers/creations_controller_spec.rb
index 2b1276d6..99a604c7 100644
--- a/spec/controllers/creations_controller_spec.rb
+++ b/spec/controllers/creations_controller_spec.rb
@@ -3,14 +3,15 @@ require 'spec_helper'
describe CreationsController do
include Devise::TestHelpers
- let(:user){ Factory.create(:user) }
- let(:creation){ Factory.create(:creation) }
+ let(:user){ FactoryGirl.build(:user) }
+ let(:creation){ FactoryGirl.build(:creation) }
def mock_creation(stubs={})
@mock_creation ||= mock_model(Creation, stubs).as_null_object
end
before (:each) do
+ puts "WEBSITE #{user.website}"
request.env['warden'] = mock(Warden, :authenticate => user, :authenticate! => user)
end
diff --git a/spec/controllers/photos_controller_spec.rb b/spec/controllers/photos_controller_spec.rb
index c437bdc4..600cd0a3 100644
--- a/spec/controllers/photos_controller_spec.rb
+++ b/spec/controllers/photos_controller_spec.rb
@@ -3,8 +3,8 @@ require 'spec_helper'
describe PhotosController do
include Devise::TestHelpers
- let(:user){ Factory.create(:user) }
- let(:creation){ Factory.create(:creation) }
+ let(:user){ FactoryGirl.create(:user) }
+ let(:creation){ FactoryGirl.create(:creation) }
def mock_creation(stubs={})
@mock_creation ||= mock_model(Creation, stubs).as_null_object