Upstream sync

spec/models/contract_template_spec.rb

@@ -22,14 +22,10 @@ describe ContractTemplate do
     it { is_expected.to validate_presence_of(:release_type) }
   end
 
-  describe '#fee' do
-    it { is_expected.to monetize(:fee) }
-  end
-
   describe '#fee?' do
     it 'returns true when there is a fee amount' do
       fee_contract    = build(:contract_template, fee: 500)
-      no_fee_contract = build(:contract_template, fee: 0)
+      no_fee_contract = build(:contract_template, fee: nil)
 
       expect(fee_contract).to be_fee
       expect(no_fee_contract).not_to be_fee

spec/models/video_release_confirmation_spec.rb

@@ -4,7 +4,6 @@ RSpec.describe VideoReleaseConfirmation do
   describe "associations" do
     it { is_expected.to belong_to(:releasable) }
     it { is_expected.to belong_to(:video) }
-    it { is_expected.to belong_to(:file_info).optional }
   end
 
   describe "#appears_at" do