From cbbecf7c40e8102a2b0c24aabb3aabf7e89391cf Mon Sep 17 00:00:00 2001 From: Luc Donnet Date: Mon, 4 Sep 2017 15:29:42 +0200 Subject: Delete AAM in import_resource model Refs #4527 --- app/models/import_resource.rb | 21 +-------------------- spec/factories/import_resources.rb | 2 +- spec/models/import_resource_spec.rb | 4 ++-- 3 files changed, 4 insertions(+), 23 deletions(-) diff --git a/app/models/import_resource.rb b/app/models/import_resource.rb index 61c270aa2..9f4d2872e 100644 --- a/app/models/import_resource.rb +++ b/app/models/import_resource.rb @@ -1,28 +1,9 @@ class ImportResource < ActiveRecord::Base - include AASM belongs_to :import extend Enumerize enumerize :status, in: %i(OK ERROR WARNING IGNORED), scope: true validates_presence_of :name, :resource_type, :reference - - aasm column: :status do - state :new, :initial => true - state :pending - state :successful - state :failed - - event :run do - transitions :from => [:new, :failed], :to => :pending - end - - event :successful do - transitions :from => [:pending, :failed], :to => :successful - end - - event :failed do - transitions :from => :pending, :to => :failed - end - end + end diff --git a/spec/factories/import_resources.rb b/spec/factories/import_resources.rb index 125f549b8..76afcc486 100644 --- a/spec/factories/import_resources.rb +++ b/spec/factories/import_resources.rb @@ -1,7 +1,7 @@ FactoryGirl.define do factory :import_resource do association :import - status :new + status :WARNING sequence(:name) { |n| "Import resource #{n}" } resource_type 'type' reference 'reference' diff --git a/spec/models/import_resource_spec.rb b/spec/models/import_resource_spec.rb index 6416babdc..c88bb5dd2 100644 --- a/spec/models/import_resource_spec.rb +++ b/spec/models/import_resource_spec.rb @@ -3,7 +3,7 @@ require 'rails_helper' RSpec.describe ImportResource, :type => :model do it { should belong_to(:import) } - it { should enumerize(:status).in(:OK, :ERROR, :WARNING, :IGNORED) } + it { should enumerize(:status).in("OK", "ERROR", "WARNING", "IGNORED") } it { should validate_presence_of(:name) } it { should validate_presence_of(:resource_type) } @@ -13,7 +13,7 @@ RSpec.describe ImportResource, :type => :model do let(:import_resource) { create(:import_resource) } it 'should initialize with new state' do - expect(import_resource.new?).to be_truthy + expect(import_resource.status).to eq("WARNING") end end end -- cgit v1.2.3