fix: tests because of index

Author: Adrian Herrmann

spec/api/chemotion/cell_line_api_spec.rb

@@ -10,10 +10,12 @@
   describe 'GET /api/v1/cell_lines/' do
     let(:collection) { create(:collection) }
     let!(:user) { create(:user, collections: [collection]) }
-    let!(:cell_line) { create(:cellline_sample, collections: [collection]) }
+    let(:material) { create(:cellline_material) }
+    let!(:cell_line) { create(:cellline_sample, collections: [collection], cellline_material: material) }
     let!(:cell_line2) do
       create(:cellline_sample,
              collections: [collection],
+             cellline_material: material,
              created_at: DateTime.parse('2000-01-01'),
              updated_at: DateTime.parse('2010-01-01'))
     end

spec/api/chemotion/suggestion_api_spec.rb

@@ -5,6 +5,7 @@
 
 describe Chemotion::SuggestionAPI do
   let!(:user) { create(:person, first_name: 'tam', last_name: 'M') }
+  let(:material) { create(:cellline_material) }
   let(:collection) { create(:collection, user: user, is_shared: true, permission_level: 1, sample_detail_level: 10) }
   let(:query) { 'query' }
   let(:json_repsonse) { JSON.parse(response.body) }
@@ -19,9 +20,11 @@
 
   describe 'GET /api/v1/cell_lines/suggestions/cell_lines' do
     include_context 'api request authorization context'
-    let!(:cell_line) { create(:cellline_sample, collections: [collection]) }
-    let!(:cell_line2) { create(:cellline_sample, name: 'search-example', collections: [collection]) }
-    let!(:cell_line_without_col) { create(:cellline_sample, name: 'search-example') }
+    let!(:cell_line) { create(:cellline_sample, collections: [collection], cellline_material: material) }
+    let!(:cell_line2) do
+      create(:cellline_sample, name: 'search-example', collections: [collection], cellline_material: material)
+    end
+    let!(:cell_line_without_col) { create(:cellline_sample, name: 'search-example', cellline_material: material) }
     let!(:sample) { create(:sample, name: 'search-example', collections: [collection]) }
 
     before do
@@ -59,8 +62,10 @@
 
   describe 'GET /api/v1/cell_lines/suggestions/all' do
     include_context 'api request authorization context'
-    let!(:cell_line) { create(:cellline_sample, collections: [collection]) }
-    let!(:cell_line2) { create(:cellline_sample, name: 'search-example', collections: [collection]) }
+    let!(:cell_line) { create(:cellline_sample, collections: [collection], cellline_material: material) }
+    let!(:cell_line2) do
+      create(:cellline_sample, name: 'search-example', collections: [collection], cellline_material: material)
+    end
     let!(:sample) { create(:sample, name: 'search-example', collections: [collection]) }
 
     before do

spec/api/collection_api_spec.rb

@@ -48,6 +48,7 @@
       create(:sync_collections_user, collection_id: c_sync_w.id, user_id: user.id, permission_level: 1,
                                      shared_by_id: owner.id, fake_ancestry: c_sync_ancestry.id.to_s)
     end
+    let(:material) { create(:cellline_material) }
 
     before do
       allow_any_instance_of(WardenAuthentication).to receive(:current_user).and_return(user)
@@ -184,7 +185,7 @@
             JSON.parse(response.body)['collections'].map do |root|
               root['children'].pluck('id')
             end.flatten,
-          ).to match_array [c4.id, c6.id]
+          ).to contain_exactly(c4.id, c6.id)
         end
       end
     end
@@ -303,9 +304,9 @@
         #   c_target.reload2
         # end
         describe 'PUT /api/v1/collections/elements' do
-          let!(:cell_line_1) { create(:cellline_sample, collections: [c_source]) }
-          let!(:cell_line_2) { create(:cellline_sample, collections: [c_source]) }
-          let!(:cell_line_3) { create(:cellline_sample, collections: [c_source]) }
+          let!(:cell_line_1) { create(:cellline_sample, collections: [c_source], cellline_material: material) }
+          let!(:cell_line_2) { create(:cellline_sample, collections: [c_source], cellline_material: material) }
+          let!(:cell_line_3) { create(:cellline_sample, collections: [c_source], cellline_material: material) }
           let(:cell_line_ids) { [] }
           let!(:ui_state) do
             {
@@ -354,7 +355,9 @@
           end
 
           context 'when try to move cell line element into collection where it already exists' do
-            let!(:cellline_in_two_colls) { create(:cellline_sample, collections: [c_source, c_target]) }
+            let!(:cellline_in_two_colls) do
+              create(:cellline_sample, collections: [c_source, c_target], cellline_material: material)
+            end
             let(:target_collection_id) { c_target.id }
             let(:cell_line_ids) { [cellline_in_two_colls.id] }
 
@@ -392,7 +395,7 @@
         end
 
         describe 'POST /api/v1/collections/elements' do
-          let!(:cell_line_sample) { create(:cellline_sample, collections: [c_source]) }
+          let!(:cell_line_sample) { create(:cellline_sample, collections: [c_source], cellline_material: material) }
           let!(:ui_state) do
             {
               cell_line: {
@@ -686,10 +689,10 @@
             c = Collection.where(is_shared: true, user_id: u2.id, shared_by_id: user.id)
                           .where("label LIKE 'My project with%'").first
             expect(c).not_to be_nil
-            expect(c.samples).to match_array [s1, s3]
-            expect(c.reactions).to match_array [r1]
-            expect(c.wellplates).to match_array [w1]
-            expect(c.screens).to match_array []
+            expect(c.samples).to contain_exactly(s1, s3)
+            expect(c.reactions).to contain_exactly(r1)
+            expect(c.wellplates).to contain_exactly(w1)
+            expect(c.screens).to be_empty
           end
         end
 

spec/api/element_api_spec.rb

@@ -3,7 +3,6 @@
 # rubocop: disable RSpec/NestedGroups
 # rubocop: disable RSpec/AnyInstance
 # rubocop: disable RSpec/LetSetup
-# rubocop: disable RSpec/FilePath
 # rubocop: disable RSpec/IndexedLet, Lint/RedundantCopDisableDirective, RSpec/Rails/HaveHttpStatus
 
 require 'rails_helper'
@@ -13,8 +12,13 @@
   let!(:collection) { create(:collection, user_id: user.id) }
 
   describe 'DELETE /api/v1/ui_state' do
-    let!(:cell_line_sample1) { create(:cellline_sample, collections: [collection, collection2]) }
-    let!(:cell_line_sample2) { create(:cellline_sample, collections: [collection, collection2]) }
+    let(:material) { create(:cellline_material) }
+    let!(:cell_line_sample1) do
+      create(:cellline_sample, collections: [collection, collection2], cellline_material: material)
+    end
+    let!(:cell_line_sample2) do
+      create(:cellline_sample, collections: [collection, collection2], cellline_material: material)
+    end
     let!(:collection2) { create(:collection, user_id: user.id) }
 
     context 'with user with delete access is logged in,' do
@@ -112,5 +116,4 @@
 # rubocop: enable RSpec/NestedGroups
 # rubocop: enable RSpec/AnyInstance
 # rubocop: enable RSpec/LetSetup
-# rubocop: enable RSpec/FilePath
 # rubocop: enable RSpec/IndexedLet, Lint/RedundantCopDisableDirective, RSpec/Rails/HaveHttpStatus

spec/usecases/cell_lines/load_spec.rb

@@ -5,8 +5,9 @@
 RSpec.describe Usecases::CellLines::Load do
   let(:user) { create(:user) }
   let(:collection) { create(:collection) }
-  let(:cellline_sample) { create(:cellline_sample) }
-  let(:cellline_sample2) { create(:cellline_sample) }
+  let(:material) { create(:cellline_material) }
+  let(:cellline_sample) { create(:cellline_sample, cellline_material: material) }
+  let(:cellline_sample2) { create(:cellline_sample, cellline_material: material) }
   let(:id) { cellline_sample.id }
 
   let(:loaded_cellline_sample) { described_class.new(id, user).execute! }