specs: improve search controller specs

spec/controllers/recherche_controller_spec.rb

@@ -1,15 +1,35 @@
 describe RechercheController, type: :controller do
-  let(:dossier) { create(:dossier, :en_construction, :with_populated_annotations) }
-  let(:dossier2) { create(:dossier, :en_construction, procedure: dossier.procedure) }
+  let(:procedure) {
+    create(:procedure,
+                           :published,
+                           :for_individual,
+                           :with_type_de_champ,
+                           :with_type_de_champ_private,
+                           types_de_champ_count: 2,
+                           types_de_champ_private_count: 2)
+  }
+  let(:dossier) { create(:dossier, :en_construction, :with_individual, procedure: procedure) }
   let(:instructeur) { create(:instructeur) }
 
-  let(:dossier_with_expert) { avis.dossier }
-  let(:avis) { create(:avis, dossier: create(:dossier, :en_construction, :with_populated_annotations)) }
+  let(:dossier_with_expert) { create(:dossier, :en_construction, :with_individual, procedure: procedure) }
+  let(:avis) { create(:avis, dossier: dossier_with_expert) }
 
   let(:user) { instructeur.user }
 
   before do
     instructeur.assign_to_procedure(dossier.procedure)
+
+    dossier.champs[0].value = "Name of district A"
+    dossier.champs[1].value = "Name of city A"
+    dossier.champs_private[0].value = "Dossier A is complete"
+    dossier.champs_private[1].value = "Dossier A is valid"
+    dossier.save!
+
+    dossier_with_expert.champs[0].value = "Name of district B"
+    dossier_with_expert.champs[1].value = "name of city B"
+    dossier_with_expert.champs_private[0].value = "Dossier B is incomplete"
+    dossier_with_expert.champs_private[1].value = "Dossier B is invalid"
+    dossier_with_expert.save!
   end
 
   describe 'GET #index' do
@@ -46,8 +66,8 @@ describe RechercheController, type: :controller do
       end
 
       context 'when instructeur do not own the dossier' do
-        let(:dossier3) { create(:dossier, :en_construction) }
-        let(:query) { dossier3.id }
+        let(:dossier2) { create(:dossier, :en_construction) }
+        let(:query) { dossier2.id }
 
         it { is_expected.to have_http_status(200) }
 
@@ -69,29 +89,49 @@ describe RechercheController, type: :controller do
       end
     end
 
-    describe 'by private annotations' do
-      context 'when instructeur search by private annotations' do
-        let(:query) { dossier.private_search_terms }
+    describe 'by champs' do
+      let(:query) { 'district A' }
 
-        before { subject }
+      before { subject }
 
-        it { is_expected.to have_http_status(200) }
+      it { is_expected.to have_http_status(200) }
 
-        it 'returns the expected dossier' do
-          expect(assigns(:projected_dossiers).count).to eq(1)
-          expect(assigns(:projected_dossiers).first.dossier_id).to eq(dossier.id)
-        end
+      it 'returns the expected dossier' do
+        expect(assigns(:projected_dossiers).count).to eq(1)
+        expect(assigns(:projected_dossiers).first.dossier_id).to eq(dossier.id)
       end
 
-      context 'when expert search by private annotations' do
+      context 'as an expert' do
         let(:user) { avis.experts_procedure.expert.user }
-        let(:query) { dossier_with_expert.private_search_terms }
-
-        before { subject }
+        let(:query) { 'district' }
 
         it { is_expected.to have_http_status(200) }
 
-        it 'returns 0 dossiers' do
+        it 'returns only the dossier available to the expert' do
+          expect(assigns(:projected_dossiers).count).to eq(1)
+          expect(assigns(:projected_dossiers).first.dossier_id).to eq(dossier_with_expert.id)
+        end
+      end
+    end
+
+    describe 'by private annotations' do
+      let(:query) { 'invalid' }
+
+      before { subject }
+
+      it { is_expected.to have_http_status(200) }
+
+      it 'returns the expected dossier' do
+        expect(assigns(:projected_dossiers).count).to eq(1)
+        expect(assigns(:projected_dossiers).first.dossier_id).to eq(dossier_with_expert.id)
+      end
+
+      context 'as an expert' do
+        let(:user) { avis.experts_procedure.expert.user }
+
+        it { is_expected.to have_http_status(200) }
+
+        it 'does not allow experts to search in private annotations' do
           expect(assigns(:projected_dossiers).count).to eq(0)
         end
       end