From 3af20c96c77e270d4d1f248be6060f6c028f892f Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Fri, 3 Jul 2020 14:11:56 +0200 Subject: [PATCH] Fix tests and checklist item validation [SCI-4776] --- app/models/checklist_item.rb | 2 +- spec/factories/tinymce_assets.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/checklist_item.rb b/app/models/checklist_item.rb index c61c52eb3..fa8d3ed7d 100644 --- a/app/models/checklist_item.rb +++ b/app/models/checklist_item.rb @@ -5,7 +5,7 @@ class ChecklistItem < ApplicationRecord length: { maximum: Constants::TEXT_MAX_LENGTH } validates :checklist, presence: true validates :checked, inclusion: { in: [true, false] } - validates :position, uniqueness: { scope: :checklist } + validates :position, uniqueness: { scope: :checklist }, unless: -> { position.nil? } belongs_to :checklist, inverse_of: :checklist_items diff --git a/spec/factories/tinymce_assets.rb b/spec/factories/tinymce_assets.rb index 5de498ec7..4f27f2ef7 100644 --- a/spec/factories/tinymce_assets.rb +++ b/spec/factories/tinymce_assets.rb @@ -3,8 +3,8 @@ FactoryBot.define do factory :tiny_mce_asset do association :team, factory: :team - image do - fixture_file_upload(Rails.root.join('spec', 'fixtures', 'files', 'test.jpg'), 'image/jpg') + after(:create) do |tiny_mce_asset| + tiny_mce_asset.image.attach(io: File.open(Rails.root.join('spec/fixtures/files/test.jpg')), filename: 'test.jpg') end end end