From 2414ce8276d95a2f269607dc1e46ad9ad4b80715 Mon Sep 17 00:00:00 2001 From: Tyrel Souza Date: Wed, 30 Apr 2014 15:53:58 -0400 Subject: [PATCH] fix tests --- app/models/videolisting.rb | 6 ++++-- spec/controllers/campaigns_controller_spec.rb | 9 ++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/app/models/videolisting.rb b/app/models/videolisting.rb index ba1a004..e3b5456 100644 --- a/app/models/videolisting.rb +++ b/app/models/videolisting.rb @@ -28,8 +28,10 @@ class Videolisting < ActiveRecord::Base end def fix_videocode - self.videocode = "#{self.campaign.listingcode}-#{self.id}" - self.save + if self.campaign + self.videocode = "#{self.campaign.listingcode}-#{self.id}" + self.save + end end def set_defaults diff --git a/spec/controllers/campaigns_controller_spec.rb b/spec/controllers/campaigns_controller_spec.rb index 623081b..a1f2b07 100644 --- a/spec/controllers/campaigns_controller_spec.rb +++ b/spec/controllers/campaigns_controller_spec.rb @@ -61,13 +61,16 @@ describe CampaignsController do it 'creates a campaign with a nested videolisting' do campaign[:videolistings_attributes] = [videolisting,] - post :create, campaign: campaign + + expect do + post :create, campaign: campaign + end.to change(Campaign, :count).by(1) flash = response.request.env["action_dispatch.request.flash_hash"][:alert] expect(flash).not_to eq("You need to sign in or sign up before continuing.") - expect(Campaign.last.videolistings.last.videocode).to eq videolisting[:videocode] - expect(Campaign.last.videolistings.count).to eq 1 + + end it "expects the clientid to be correct" do