Merge pull request #304 from bmic-development/kg-protocol_filter_spec…

…_random_failures KG - Protocol Filter Randomly Failing Specs
sparc-request · May 30, 2017 · 2e3706d · 2e3706d
2 parents d60817d + c48064a
commit 2e3706d
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 22 deletions.
diff --git a/...shboard/protocols/index/filters/admin_user_filters_my_admin_protocols_with_search_spec.rb b/...shboard/protocols/index/filters/admin_user_filters_my_admin_protocols_with_search_spec.rb
@@ -299,9 +299,13 @@
 
   context "HR# search" do
     before :each do
-      @protocol1 = create(:study_without_validations, primary_pi: jug2, title: "title%", short_title: "Protocol1")
-      @protocol2 = create(:study_without_validations, primary_pi: jug2, title: "xTitle", short_title: "Protocol2")
-      @protocol3 = create(:study_without_validations, primary_pi: jug2, title: "a%a", short_title: "Protocol3")
+      hsi1       = create(:human_subjects_info, hr_number: 111111)
+      hsi2       = create(:human_subjects_info, hr_number: 222222)
+      hsi3       = create(:human_subjects_info, hr_number: 333333)
+
+      @protocol1 = create(:study_without_validations, primary_pi: jug2, title: "title%", short_title: "Protocol1", human_subjects_info: hsi1)
+      @protocol2 = create(:study_without_validations, primary_pi: jug2, title: "xTitle", short_title: "Protocol2", human_subjects_info: hsi2)
+      @protocol3 = create(:study_without_validations, primary_pi: jug2, title: "a%a", short_title: "Protocol3", human_subjects_info: hsi3)
 
       service_request1 = create(:service_request_without_validations, protocol: @protocol1)
       service_request2 = create(:service_request_without_validations, protocol: @protocol2)
@@ -405,9 +409,13 @@
 
   context "All search" do
     before :each do
-      @protocol1 = create(:study_without_validations, id: 555555, primary_pi: jug2, title: "title%", short_title: "Protocol1")
-      @protocol2 = create(:study_without_validations, id: 666666, primary_pi: jug2, title: "xTitle", short_title: "Protocol2")
-      @protocol3 = create(:study_without_validations, id: 777777, primary_pi: other_user, title: @protocol1.id.to_s, short_title: "Protocol3", research_master_id: 1234)
+      hsi1       = create(:human_subjects_info, hr_number: 111111)
+      hsi2       = create(:human_subjects_info, hr_number: 222222)
+      hsi3       = create(:human_subjects_info, hr_number: 333333)
+
+      @protocol1 = create(:study_without_validations, id: 555555, primary_pi: jug2, title: "title%", short_title: "Protocol1", human_subjects_info: hsi1)
+      @protocol2 = create(:study_without_validations, id: 666666, primary_pi: jug2, title: "xTitle", short_title: "Protocol2", human_subjects_info: hsi2)
+      @protocol3 = create(:study_without_validations, id: 777777, primary_pi: other_user, title: @protocol1.id.to_s, short_title: "Protocol3", research_master_id: 1234, human_subjects_info: hsi3)
       @protocol4 = create(:project_without_validations, id: 888888, primary_pi: jug2, title: "101010101", short_title: "Protocol4")
 
       service_request1 = create(:service_request_without_validations, protocol: @protocol1)

diff --git a/...res/dashboard/protocols/index/filters/admin_user_filters_my_protocols_with_search_spec.rb b/...res/dashboard/protocols/index/filters/admin_user_filters_my_protocols_with_search_spec.rb
@@ -299,9 +299,13 @@
 
   context "HR# search" do
     before :each do
-      @protocol1 = create(:study_without_validations, primary_pi: jug2, title: "title%", short_title: "Protocol1")
-      @protocol2 = create(:study_without_validations, primary_pi: jug2, title: "xTitle", short_title: "Protocol2")
-      @protocol3 = create(:study_without_validations, primary_pi: jug2, title: "a%a", short_title: "Protocol3")
+      hsi1       = create(:human_subjects_info, hr_number: 111111)
+      hsi2       = create(:human_subjects_info, hr_number: 222222)
+      hsi3       = create(:human_subjects_info, hr_number: 333333)
+
+      @protocol1 = create(:study_without_validations, primary_pi: jug2, title: "title%", short_title: "Protocol1", human_subjects_info: hsi1)
+      @protocol2 = create(:study_without_validations, primary_pi: jug2, title: "xTitle", short_title: "Protocol2", human_subjects_info: hsi2)
+      @protocol3 = create(:study_without_validations, primary_pi: jug2, title: "a%a", short_title: "Protocol3", human_subjects_info: hsi3)
 
       service_request1 = create(:service_request_without_validations, protocol: @protocol1)
       service_request2 = create(:service_request_without_validations, protocol: @protocol2)
@@ -405,10 +409,14 @@
 
   context "All search" do
     before :each do
-      @protocol1 = create(:study_without_validations, id: 555555, primary_pi: jug2, title: "title%", short_title: "Protocol1")
-      @protocol2 = create(:study_without_validations, id: 666666, primary_pi: jug2, title: "xTitle", short_title: "Protocol2")
-      @protocol3 = create(:study_without_validations, id: 777777, primary_pi: other_user, title: @protocol1.id.to_s, short_title: "Protocol3", research_master_id: 1234)
-      @protocol4 = create(:project_without_validations, id: 888888, primary_pi: jug2, title: "101010101", short_title: "Protocol4")
+      hsi1       = create(:human_subjects_info, hr_number: 111111)
+      hsi2       = create(:human_subjects_info, hr_number: 222222)
+      hsi3       = create(:human_subjects_info, hr_number: 333333)
+
+      @protocol1 = create(:study_without_validations, id: 555555, primary_pi: jug2, title: "title%", short_title: "Protocol1", human_subjects_info: hsi1)
+      @protocol2 = create(:study_without_validations, id: 666666, primary_pi: jug2, title: "xTitle", short_title: "Protocol2", human_subjects_info: hsi2)
+      @protocol3 = create(:study_without_validations, id: 777777, primary_pi: other_user, title: @protocol1.id.to_s, short_title: "Protocol3", research_master_id: 1234, human_subjects_info: hsi3)
+      @protocol4 = create(:project_without_validations, id: 888888, primary_pi: jug2, title: "TheRubyRacer", short_title: "Protocol4")
 
       service_request1 = create(:service_request_without_validations, protocol: @protocol1)
       service_request2 = create(:service_request_without_validations, protocol: @protocol2)
@@ -646,7 +654,7 @@
     end
 
     it 'should return projects and not just studies' do
-      fill_in 'filterrific_search_query_search_text', with: '101'
+      fill_in 'filterrific_search_query_search_text', with: 'Ruby'
       find('#apply-filter-button').click
       wait_for_javascript_to_finish
 

diff --git a/spec/features/dashboard/protocols/index/filters/general_user_filters_with_search_spec.rb b/spec/features/dashboard/protocols/index/filters/general_user_filters_with_search_spec.rb
@@ -272,9 +272,13 @@
 
   context "HR# search" do
     before :each do
-      @protocol1 = create(:study_without_validations, primary_pi: jug2, title: "title%", short_title: "Protocol1")
-      @protocol2 = create(:study_without_validations, primary_pi: jug2, title: "xTitle", short_title: "Protocol2")
-      @protocol3 = create(:study_without_validations, primary_pi: jug2, title: "a%a", short_title: "Protocol3")
+      hsi1       = create(:human_subjects_info, hr_number: 111111)
+      hsi2       = create(:human_subjects_info, hr_number: 222222)
+      hsi3       = create(:human_subjects_info, hr_number: 333333)
+
+      @protocol1 = create(:study_without_validations, primary_pi: jug2, title: "title%", short_title: "Protocol1", human_subjects_info: hsi1)
+      @protocol2 = create(:study_without_validations, primary_pi: jug2, title: "xTitle", short_title: "Protocol2", human_subjects_info: hsi2)
+      @protocol3 = create(:study_without_validations, primary_pi: jug2, title: "a%a", short_title: "Protocol3", human_subjects_info: hsi3)
 
       service_request1 = create(:service_request_without_validations, protocol: @protocol1)
       service_request2 = create(:service_request_without_validations, protocol: @protocol2)
@@ -370,10 +374,14 @@
 
   context "All search" do
     before :each do
-      @protocol1 = create(:study_without_validations, id: 555555, primary_pi: jug2, title: "title%", short_title: "Protocol1")
-      @protocol2 = create(:study_without_validations, id: 666666, primary_pi: jug2, title: "xTitle", short_title: "Protocol2")
-      @protocol3 = create(:study_without_validations, id: 777777, primary_pi: other_user, title: @protocol1.id.to_s, short_title: "Protocol3", research_master_id: 1234)
-      @protocol4 = create(:project_without_validations, id: 888888, primary_pi: jug2, title: "101010101", short_title: "Protocol4")
+      hsi1       = create(:human_subjects_info, hr_number: 111111)
+      hsi2       = create(:human_subjects_info, hr_number: 222222)
+      hsi3       = create(:human_subjects_info, hr_number: 333333)
+
+      @protocol1 = create(:study_without_validations, id: 555555, primary_pi: jug2, title: "title%", short_title: "Protocol1", human_subjects_info: hsi1)
+      @protocol2 = create(:study_without_validations, id: 666666, primary_pi: jug2, title: "xTitle", short_title: "Protocol2", human_subjects_info: hsi2)
+      @protocol3 = create(:study_without_validations, id: 777777, primary_pi: other_user, title: @protocol1.id.to_s, short_title: "Protocol3", research_master_id: 1234, human_subjects_info: hsi3)
+      @protocol4 = create(:project_without_validations, id: 888888, primary_pi: jug2, title: "TheRubyRacer", short_title: "Protocol4")
 
       service_request1 = create(:service_request_without_validations, protocol: @protocol1)
       service_request2 = create(:service_request_without_validations, protocol: @protocol2)
@@ -607,7 +615,7 @@
     end
 
     it 'should return projects and not just studies' do
-      fill_in 'filterrific_search_query_search_text', with: '101'
+      fill_in 'filterrific_search_query_search_text', with: 'Ruby'
       find('#apply-filter-button').click
       wait_for_javascript_to_finish