diff --git a/app/models/allinson_flex/profile.rb b/app/models/allinson_flex/profile.rb index e161b1b..458f3db 100644 --- a/app/models/allinson_flex/profile.rb +++ b/app/models/allinson_flex/profile.rb @@ -22,7 +22,7 @@ class Profile < ApplicationRecord # serlializations serialize :profile # validations - # validates :name, :profile_version, :responsibility, presence: true + validates :name, :profile_version, :responsibility, presence: true validates :profile, presence: true validates :profile_version, uniqueness: true # callbacks diff --git a/spec/factories/contexts.rb b/spec/factories/contexts.rb index 70a8dc7..ab8f3b2 100644 --- a/spec/factories/contexts.rb +++ b/spec/factories/contexts.rb @@ -2,7 +2,7 @@ factory :allinson_flex_context, class: AllinsonFlex::Context do name { "flexible_context" } allinson_flex_profile { FactoryBot.build(:allinson_flex_profile) } - allinson_flex_context { FactoryBot.build(:allinson_flex_context) } + # allinson_flex_context { FactoryBot.build(:allinson_flex_context) } end factory :allinson_flex_context_assigned, class: AllinsonFlex::Context do diff --git a/spec/models/allinson_flex/profile_class_spec.rb b/spec/models/allinson_flex/profile_class_spec.rb index f67ae96..f8a4cab 100644 --- a/spec/models/allinson_flex/profile_class_spec.rb +++ b/spec/models/allinson_flex/profile_class_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' RSpec.describe AllinsonFlex::ProfileClass, type: :model do - let(:profile_class) { FactoryBot.build(:allinson_flex_profile_class) } + let(:profile_class) { FactoryBot.build(:allinson_flex_class) } it 'is valid' do expect(profile_class).to be_valid diff --git a/spec/models/allinson_flex/profile_property_spec.rb b/spec/models/allinson_flex/profile_property_spec.rb index f7834de..c9937d1 100644 --- a/spec/models/allinson_flex/profile_property_spec.rb +++ b/spec/models/allinson_flex/profile_property_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' RSpec.describe AllinsonFlex::ProfileProperty, type: :model do - let(:profile_property) { FactoryBot.build(:profile_property) } + let(:profile_property) { FactoryBot.build(:allinson_flex_property) } it 'is valid' do expect(profile_property).to be_valid diff --git a/spec/models/allinson_flex/profile_spec.rb b/spec/models/allinson_flex/profile_spec.rb index 7616df3..8891b0f 100644 --- a/spec/models/allinson_flex/profile_spec.rb +++ b/spec/models/allinson_flex/profile_spec.rb @@ -26,7 +26,6 @@ describe 'methods' do before do profile.add_date_modified - profile.add_profile_data end it '#available_classes returns an array of Classes' do @@ -36,7 +35,7 @@ end it '#profile is set' do expect(profile.profile).to be_present - expect(profile.profile).match('Indiana University') + expect(profile.name).to eq('Indiana University') end it '#available_text_names returns an array of values' do expect(profile.available_text_names).to eq( diff --git a/spec/models/allinson_flex/profile_text_spec.rb b/spec/models/allinson_flex/profile_text_spec.rb index b8c2c21..f07c9be 100644 --- a/spec/models/allinson_flex/profile_text_spec.rb +++ b/spec/models/allinson_flex/profile_text_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' RSpec.describe AllinsonFlex::ProfileText, type: :model do - let(:profile_text) { FactoryBot.build(:allinson_flex_profile_text) } + let(:profile_text) { FactoryBot.build(:allinson_flex_text) } it 'is valid' do expect(profile_text).to be_valid @@ -13,6 +13,6 @@ it { is_expected.to validate_presence_of(:value) } end describe 'associations' do - it { is_expected.to belong_to(:textable).optional } + it { is_expected.to belong_to(:textable) } end end diff --git a/spec/services/allinson_flex/dynamic_schema_service_spec.rb b/spec/services/allinson_flex/dynamic_schema_service_spec.rb index d386b82..77546e8 100644 --- a/spec/services/allinson_flex/dynamic_schema_service_spec.rb +++ b/spec/services/allinson_flex/dynamic_schema_service_spec.rb @@ -10,10 +10,12 @@ work_class_name: 'Image' ) end - let(:allinson_flex_context) { build(:allinson_flex_context_assigned) } - let(:default_allinson_flex_context) { build(:allinson_flex_context_default) } - let(:dynamic_schema) { build(:dynamic_schema) } - let(:default_dynamic_schema) { build(:dynamic_schema_default) } + + let(:allinson_flex_context) { FactoryBot.build(:allinson_flex_context_assigned) } + let(:default_allinson_flex_context) { FactoryBot.build(:allinson_flex_context_default) } + let(:dynamic_schema) { FactoryBot.build(:dynamic_schema) } + let(:default_dynamic_schema) { FactoryBot.build(:dynamic_schema_default) } + before do allow(AdminSet).to receive_message_chain(:find, :metadata_context).and_return(allinson_flex_context) @@ -22,7 +24,7 @@ describe '#new' do context 'admin_set does not have a metadata_context' do - let(:allinson_flex_context) { create(:allinson_flex_context) } + # let(:allinson_flex_context) { create(:allinson_flex_context) } it 'raises a custom error' do expect do diff --git a/spec/services/allinson_flex/importer_spec.rb b/spec/services/allinson_flex/importer_spec.rb index db78a82..c03bce0 100644 --- a/spec/services/allinson_flex/importer_spec.rb +++ b/spec/services/allinson_flex/importer_spec.rb @@ -2,9 +2,9 @@ require 'spec_helper' -RSpec.describe AllinsonFlex::Importer do +RSpec.describe AllinsonFlex::Importer, focus: true do describe '#load_profile_from_path' do - let(:profile) { described_class.load_profile_from_path(path: File.join(RSpec.configuration.fixture_path, 'files/yaml_example.yaml')) } + let(:profile) { described_class.load_profile_from_path(path: './spec/fixtures/files/yaml_example.yaml') } it 'returns valid with a valid path' do expect(profile) diff --git a/spec/views/hyrax/my/allinson_flex_profiles/index.html.erb_spec.rb b/spec/views/allinson_flex/profiles/index.html.erb_spec.rb similarity index 78% rename from spec/views/hyrax/my/allinson_flex_profiles/index.html.erb_spec.rb rename to spec/views/allinson_flex/profiles/index.html.erb_spec.rb index 05ed6d4..ebf4da2 100644 --- a/spec/views/hyrax/my/allinson_flex_profiles/index.html.erb_spec.rb +++ b/spec/views/allinson_flex/profiles/index.html.erb_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'hyrax/my/allinson_flex_profiles/index.html.erb', type: :view do +RSpec.describe 'views/allinson_flex/profiles/index.html.erb', type: :view do before do allow(view).to receive(:current_ability).and_return(ability) allow(view).to receive(:provide).and_yield @@ -15,8 +15,8 @@ let(:ability) { instance_double(Ability, allinson_flex_profile_abilities: true) } it 'the line item displays the work and its actions' do - expect(rendered).to have_selector('h1', text: 'AllinsonFlex Profiles') + expect(rendered).to have_selector('h1', text: 'Allinson Flex Profiles') expect(rendered).to have_link('Create Profile') end end -end +end \ No newline at end of file