summaryrefslogtreecommitdiff
path: root/spec/controllers
diff options
context:
space:
mode:
authormo khan <mo@mokhan.ca>2014-10-16 20:43:15 -0600
committermo khan <mo@mokhan.ca>2014-10-16 20:43:15 -0600
commit4eb7dd4fb2ed71006aee665ae7f666ee88d44c22 (patch)
treee97551e8248a239a958fe7d2a7ff9bea5e75e183 /spec/controllers
parentf2eef36abce2148fe044b6dbda85fadf77754019 (diff)
remove usage of find cake by id query object.
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/creations_controller_spec.rb20
1 files changed, 13 insertions, 7 deletions
diff --git a/spec/controllers/creations_controller_spec.rb b/spec/controllers/creations_controller_spec.rb
index 5988ead4..e1e1b786 100644
--- a/spec/controllers/creations_controller_spec.rb
+++ b/spec/controllers/creations_controller_spec.rb
@@ -1,26 +1,32 @@
require 'rails_helper'
describe CreationsController do
- let(:user){ create(:user) }
- let(:creation){ create(:creation, :user => user) }
+ let(:user) { create(:user) }
+ let(:cake) { create(:cake, user: user) }
before(:each) do
photo = 'spec/fixtures/images/example.png'
- creation.photos.create(image: photo, image_processing: nil)
+ cake.photos.create(image: photo)
end
describe "#index" do
before { get :index }
it "should display all creations" do
- assigns(:creations).should include(creation)
+ expect(assigns(:creations)).to include(cake)
end
end
describe "#show" do
- it "assigns the requested creation" do
- get :show, :id => creation.id
- assigns(:creation).should == creation
+ it "loads the cake" do
+ get :show, id: cake.id
+ expect(assigns(:creation)).to eql(cake)
+ end
+
+ it 'loads the selected image' do
+ photo = cake.photos.first
+ get :show, id: cake.id, photo_id: photo.id
+ expect(assigns(:primary_image)).to eql(photo)
end
end
end