diff --git a/app/models/repository_list_value.rb b/app/models/repository_list_value.rb index 0e75e0e90..f21cd928b 100644 --- a/app/models/repository_list_value.rb +++ b/app/models/repository_list_value.rb @@ -13,7 +13,7 @@ class RepositoryListValue < ApplicationRecord validates :repository_cell, presence: true - def formated + def formatted item = repository_list_items.find_by_id(selected_item) return '' unless item item.name diff --git a/db/migrate/20180207095200_create_repository_list_values.rb b/db/migrate/20180207095200_create_repository_list_values.rb index 1bd52070e..e904dd1a5 100644 --- a/db/migrate/20180207095200_create_repository_list_values.rb +++ b/db/migrate/20180207095200_create_repository_list_values.rb @@ -7,7 +7,13 @@ class CreateRepositoryListValues < ActiveRecord::Migration[5.1] foreign_key: { to_table: :users } t.references :last_modified_by, index: true, - oreign_key: { to_table: :users } + foreign_key: { to_table: :users } + t.timestamps + end + + create_table :repository_list_items do |t| + t.references :repository_list_value, foreign_key: true + t.text :name, index: true, using: :gin, null: false t.timestamps end end diff --git a/db/migrate/20180207102347_create_repository_list_items.rb b/db/migrate/20180207102347_create_repository_list_items.rb deleted file mode 100644 index 33411987f..000000000 --- a/db/migrate/20180207102347_create_repository_list_items.rb +++ /dev/null @@ -1,9 +0,0 @@ -class CreateRepositoryListItems < ActiveRecord::Migration[5.1] - def change - create_table :repository_list_items do |t| - t.references :repository_list_value, foreign_key: true - t.text :name, index: true, using: :gin, null: false - t.timestamps - end - end -end diff --git a/db/schema.rb b/db/schema.rb index 293f8e720..70bbcf2f4 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20180207102347) do +ActiveRecord::Schema.define(version: 20180207095200) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -875,6 +875,7 @@ ActiveRecord::Schema.define(version: 20180207102347) do add_foreign_key "repository_date_values", "users", column: "last_modified_by_id" add_foreign_key "repository_list_items", "repository_list_values" add_foreign_key "repository_list_values", "users", column: "created_by_id" + add_foreign_key "repository_list_values", "users", column: "last_modified_by_id" add_foreign_key "repository_rows", "users", column: "created_by_id" add_foreign_key "repository_rows", "users", column: "last_modified_by_id" add_foreign_key "repository_text_values", "users", column: "created_by_id" diff --git a/spec/models/repository_list_value_spec.rb b/spec/models/repository_list_value_spec.rb index f26f42ffd..da1031781 100644 --- a/spec/models/repository_list_value_spec.rb +++ b/spec/models/repository_list_value_spec.rb @@ -35,7 +35,7 @@ RSpec.describe RepositoryListValue, type: :model do repository_list_value: repository_list_value, name: 'my item' repository_list_value.update_attribute(:selected_item, list_item.id) - expect(repository_list_value.reload.formated).to eq 'my item' + expect(repository_list_value.reload.formatted).to eq 'my item' end it 'retuns only the the item related to the list' do @@ -49,20 +49,20 @@ RSpec.describe RepositoryListValue, type: :model do repository_list_value: repository_list_value_two, name: 'new item' repository_list_value.update_attribute(:selected_item, list_item.id) - expect(repository_list_value.reload.formated).to_not eq 'my item' - expect(repository_list_value.formated).to eq '' + expect(repository_list_value.reload.formatted).to_not eq 'my item' + expect(repository_list_value.formatted).to eq '' end it 'returns an empty string if no item selected' do list_item = create :repository_list_item, repository_list_value: repository_list_value, name: 'my item' - expect(repository_list_value.reload.formated).to eq '' + expect(repository_list_value.reload.formatted).to eq '' end it 'returns an empty string if item does not exists' do repository_list_value.update_attribute(:selected_item, 9999999999) - expect(repository_list_value.reload.formated).to eq '' + expect(repository_list_value.reload.formatted).to eq '' end end end