diff --git a/spec/controllers/api/v1/event_groups_controller_spec.rb b/spec/controllers/api/v1/event_groups_controller_spec.rb index 956bf9827..4b7908d91 100644 --- a/spec/controllers/api/v1/event_groups_controller_spec.rb +++ b/spec/controllers/api/v1/event_groups_controller_spec.rb @@ -62,7 +62,7 @@ expected = %w(Bravo Delta) parsed_response = JSON.parse(response.body) expect(parsed_response['data'].size).to eq(2) - expect(parsed_response['data'].map { |item| item.dig('attributes', 'name') }).to eq(expected) + expect(parsed_response['data'].map { |item| item.dig('attributes', 'name') }).to match_array(expected) end end end diff --git a/spec/controllers/api/v1/staging_controller_spec.rb b/spec/controllers/api/v1/staging_controller_spec.rb index bce09b45c..0e1570e6b 100644 --- a/spec/controllers/api/v1/staging_controller_spec.rb +++ b/spec/controllers/api/v1/staging_controller_spec.rb @@ -299,12 +299,12 @@ def validate_no_resources_created end describe '#update_event_visibility' do - let(:event_group) { create(:event_group, organization: organization, events: events) } - let(:event_1) { create(:event, efforts: event_1_efforts) } - let(:event_2) { create(:event, efforts: event_2_efforts) } + let(:event_group) { create(:event_group, organization: organization) } + let(:event_1) { create(:event, event_group: event_group) } + let(:event_2) { create(:event, event_group: event_group) } let(:events) { [event_1, event_2] } - let(:event_1_efforts) { [create(:effort, person: create(:person)), create(:effort, person: create(:person))] } - let(:event_2_efforts) { [create(:effort, person: create(:person)), create(:effort, person: create(:person))] } + let(:event_1_efforts) { [create(:effort, person: create(:person), event: event_1), create(:effort, person: create(:person), event: event_1)] } + let(:event_2_efforts) { [create(:effort, person: create(:person), event: event_2), create(:effort, person: create(:person), event: event_2)] } let(:organization) { create(:organization) } context 'when params[:status] == "public"' do