diff options
| -rw-r--r-- | db/migrate/20170922123838_remove_compliance_control_block_id_from_compliance_controls.rb | 5 | ||||
| -rw-r--r-- | db/schema.rb | 9 | ||||
| -rw-r--r-- | spec/factories/compliance_control_blocks.rb | 1 | ||||
| -rw-r--r-- | spec/factories/compliance_controls.rb | 1 | ||||
| -rw-r--r-- | spec/models/compliance_control_block_spec.rb | 3 | ||||
| -rw-r--r-- | spec/models/compliance_control_spec.rb | 1 |
6 files changed, 12 insertions, 8 deletions
diff --git a/db/migrate/20170922123838_remove_compliance_control_block_id_from_compliance_controls.rb b/db/migrate/20170922123838_remove_compliance_control_block_id_from_compliance_controls.rb new file mode 100644 index 000000000..e3a6dfcb4 --- /dev/null +++ b/db/migrate/20170922123838_remove_compliance_control_block_id_from_compliance_controls.rb @@ -0,0 +1,5 @@ +class RemoveComplianceControlBlockIdFromComplianceControls < ActiveRecord::Migration + def change + remove_reference :compliance_controls, :compliance_control_block, index: true, foreign_key: true + end +end diff --git a/db/schema.rb b/db/schema.rb index 75808ae11..8005fce85 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20170922121609) do +ActiveRecord::Schema.define(version: 20170922123838) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -234,18 +234,16 @@ ActiveRecord::Schema.define(version: 20170922121609) do create_table "compliance_controls", id: :bigserial, force: :cascade do |t| t.integer "compliance_control_set_id" - t.integer "compliance_control_block_id" t.string "type" t.json "control_attributes" t.string "name" t.string "code" t.string "criticity" t.text "comment" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end - add_index "compliance_controls", ["compliance_control_block_id"], name: "index_compliance_controls_on_compliance_control_block_id", using: :btree add_index "compliance_controls", ["compliance_control_set_id"], name: "index_compliance_controls_on_compliance_control_set_id", using: :btree create_table "connection_links", id: :bigserial, force: :cascade do |t| @@ -978,7 +976,6 @@ ActiveRecord::Schema.define(version: 20170922121609) do add_foreign_key "compliance_control_blocks", "compliance_control_sets" add_foreign_key "compliance_control_blocks", "compliance_controls" add_foreign_key "compliance_control_sets", "organisations" - add_foreign_key "compliance_controls", "compliance_control_blocks" add_foreign_key "compliance_controls", "compliance_control_sets" add_foreign_key "group_of_lines_lines", "group_of_lines", name: "groupofline_group_fkey", on_delete: :cascade add_foreign_key "journey_frequencies", "timebands", on_delete: :nullify diff --git a/spec/factories/compliance_control_blocks.rb b/spec/factories/compliance_control_blocks.rb index 5bc45cc75..1b043324e 100644 --- a/spec/factories/compliance_control_blocks.rb +++ b/spec/factories/compliance_control_blocks.rb @@ -2,5 +2,6 @@ FactoryGirl.define do factory :compliance_control_block do sequence(:name) { |n| "Compliance control block #{n}" } association :compliance_control_set + association :compliance_control end end diff --git a/spec/factories/compliance_controls.rb b/spec/factories/compliance_controls.rb index 8aa16b674..cc9f7a822 100644 --- a/spec/factories/compliance_controls.rb +++ b/spec/factories/compliance_controls.rb @@ -6,6 +6,5 @@ FactoryGirl.define do code "code" comment "Text" association :compliance_control_set - association :compliance_control_block end end diff --git a/spec/models/compliance_control_block_spec.rb b/spec/models/compliance_control_block_spec.rb index 248049b0c..f45ec3d42 100644 --- a/spec/models/compliance_control_block_spec.rb +++ b/spec/models/compliance_control_block_spec.rb @@ -1,9 +1,12 @@ require 'rails_helper' RSpec.describe ComplianceControlBlock, type: :model do + subject { create(:compliance_control_block) } + it 'should have a valid factory' do expect(FactoryGirl.build(:compliance_control_block)).to be_valid end it { should belong_to :compliance_control_set } + it { should belong_to :compliance_control } end diff --git a/spec/models/compliance_control_spec.rb b/spec/models/compliance_control_spec.rb index b00ff4c5a..c8797b938 100644 --- a/spec/models/compliance_control_spec.rb +++ b/spec/models/compliance_control_spec.rb @@ -6,7 +6,6 @@ RSpec.describe ComplianceControl, type: :model do end it { should belong_to :compliance_control_set } - it { should belong_to :compliance_control_block } it { should validate_presence_of :criticity } it { should validate_presence_of :name } |