fix tests to add new field.
This commit is contained in:
parent
834648bd57
commit
58c95ccca4
@ -33,7 +33,7 @@ class VideolistingsController < ApplicationController
|
||||
|
||||
# Only allow a trusted parameter "white list" through.
|
||||
def videolisting_params
|
||||
params.require(:videolisting).permit(:videocode, :producttypeid, :remoteassetsarchive, :voiceoverselection, :musicselection, :clientprovidedscript, :keywords, :focus, :notes, :asseturls)
|
||||
params.require(:videolisting).permit(:videocode, :producttypeid, :remoteassetsarchive, :voiceoverselection, :musicselection, :clientprovidedscript, :keywords, :focus, :notes, :asseturls, :on_s3)
|
||||
end
|
||||
|
||||
def not_found
|
||||
|
@ -9,7 +9,7 @@ class Videolisting < ActiveRecord::Base
|
||||
after_initialize :set_defaults
|
||||
|
||||
def get_video_url
|
||||
if on_s3
|
||||
if self.on_s3 == true
|
||||
"http://s3.amazonaws.com/#{ENV['VIDEO_BUCKET']}/bvideos/#{videocode}.mp4"
|
||||
else
|
||||
"http://video2.bettervideo.com/video/pro/MP4640x360/720.#{videocode}.mp4"
|
||||
@ -17,7 +17,7 @@ class Videolisting < ActiveRecord::Base
|
||||
end
|
||||
|
||||
def get_preview_url
|
||||
if on_s3
|
||||
if self.on_s3 == true
|
||||
"http://s3.amazonaws.com/#{ENV['VIDEO_BUCKET']}/bvideos_preview/#{videocode}.jpg"
|
||||
else
|
||||
"http://video2.bettervideo.com/video/pro/jpg640x360/720.#{videocode}.jpg"
|
||||
|
@ -9,6 +9,7 @@ FactoryGirl.define do
|
||||
producttypeid 721
|
||||
toneofvideo "Upbeat, targeting families but also show business functions."
|
||||
voiceoverselection 3
|
||||
on_s3 false
|
||||
published {|x| false }
|
||||
sequence(:videocode) {|x| "video#{x}" }
|
||||
end
|
||||
|
@ -21,11 +21,11 @@ describe Videolisting, 'associations' do
|
||||
|
||||
it "can get a video url" do
|
||||
video = FactoryGirl.build(:videolisting)
|
||||
expect(video.get_video_url).to include("http://video2.bettervideo.com/video/pro/MP4640x360/720")
|
||||
expect(video.get_video_url).to include("#{video.videocode}.mp4")
|
||||
end
|
||||
|
||||
it "can get a preview url" do
|
||||
video = FactoryGirl.build(:videolisting)
|
||||
expect(video.get_preview_url).to include("http://video2.bettervideo.com/video/pro/jpg640x360/720.")
|
||||
expect(video.get_preview_url).to include("#{video.videocode}.jpg")
|
||||
end
|
||||
end
|
Loading…
Reference in New Issue
Block a user