diff --git a/app/controllers/con_tech_records_controller.rb b/app/controllers/con_tech_records_controller.rb index ca2bafdc..ba211db9 100644 --- a/app/controllers/con_tech_records_controller.rb +++ b/app/controllers/con_tech_records_controller.rb @@ -9,9 +9,9 @@ def create @conservation_record = ConservationRecord.find(params[:conservation_record_id]) @con_tech_record = @conservation_record.con_tech_records.create(create_params) if @con_tech_record.valid? - redirect_to conservation_record_path(@conservation_record) + redirect_to "#{conservation_record_path(@conservation_record)}#conservators-and-technicians" else - redirect_to conservation_record_path(@conservation_record), + redirect_to "#{conservation_record_path(@conservation_record)}#conservators-and-technicians", notice: "Conservator/Technician record not saved: #{@con_tech_record.errors.full_messages[0]}" end end @@ -20,7 +20,7 @@ def destroy @conservation_record = ConservationRecord.find(params[:conservation_record_id]) @con_tech_record = @conservation_record.con_tech_records.find(params[:id]) @con_tech_record.destroy - redirect_to conservation_record_path(@conservation_record) + redirect_to "#{conservation_record_path(@conservation_record)}#conservators-and-technicians" end private diff --git a/app/controllers/cost_return_reports_controller.rb b/app/controllers/cost_return_reports_controller.rb index c410bfad..412dab70 100644 --- a/app/controllers/cost_return_reports_controller.rb +++ b/app/controllers/cost_return_reports_controller.rb @@ -8,20 +8,20 @@ class CostReturnReportsController < ApplicationController def create @conservation_record = ConservationRecord.find(params[:conservation_record_id]) CostReturnReport.create(cost_return_report_params) - redirect_to conservation_record_path(@conservation_record), notice: 'Treatment record saved successfully' + redirect_to "#{conservation_record_path(@conservation_record)}#cost-and-return-information", notice: 'Treatment record saved successfully' end def update @conservation_record = ConservationRecord.find(params[:conservation_record_id]) @cost_return_report = @conservation_record.cost_return_report.update(cost_return_report_params) - redirect_to conservation_record_path(@conservation_record), notice: 'Treatment record updated' + redirect_to "#{conservation_record_path(@conservation_record)}#cost-and-return-information", notice: 'Treatment record updated' end def destroy @conservation_record = ConservationRecord.find(params[:conservation_record_id]) @cost_return_report = @conservation_record.cost_return_report @cost_return_report.destroy - redirect_to conservation_record_path(@conservation_record) + redirect_to "#{conservation_record_path(@conservation_record)}#cost-and-return-information" end private diff --git a/app/controllers/external_repair_records_controller.rb b/app/controllers/external_repair_records_controller.rb index b314941b..d7ff8f6d 100644 --- a/app/controllers/external_repair_records_controller.rb +++ b/app/controllers/external_repair_records_controller.rb @@ -10,9 +10,10 @@ def create @repair_record = @conservation_record.external_repair_records.create(create_params) if @repair_record.valid? - redirect_to conservation_record_path(@conservation_record) + redirect_to "#{conservation_record_path(@conservation_record)}#external-repairs" else - redirect_to conservation_record_path(@conservation_record), notice: "External repair not saved: #{@repair_record.errors.full_messages[0]}" + redirect_to "#{conservation_record_path(@conservation_record)}#external-repairs", + notice: "External repair not saved: #{@repair_record.errors.full_messages[0]}" end end @@ -20,7 +21,7 @@ def destroy @conservation_record = ConservationRecord.find(params[:conservation_record_id]) @repair_record = @conservation_record.external_repair_records.find(params[:id]) @repair_record.destroy - redirect_to conservation_record_path(@conservation_record) + redirect_to "#{conservation_record_path(@conservation_record)}#external-repairs" end private diff --git a/app/controllers/in_house_repair_records_controller.rb b/app/controllers/in_house_repair_records_controller.rb index a0bde367..f2c63321 100644 --- a/app/controllers/in_house_repair_records_controller.rb +++ b/app/controllers/in_house_repair_records_controller.rb @@ -9,9 +9,10 @@ def create @conservation_record = ConservationRecord.find(params[:conservation_record_id]) @repair_record = @conservation_record.in_house_repair_records.create(create_params) if @repair_record.valid? - redirect_to conservation_record_path(@conservation_record) + redirect_to "#{conservation_record_path(@conservation_record)}#in-house-repairs" else - redirect_to conservation_record_path(@conservation_record), notice: "In house repair not saved: #{@repair_record.errors.full_messages[0]}" + redirect_to "#{conservation_record_path(@conservation_record)}#in-house-repairs", + notice: "In house repair not saved: #{@repair_record.errors.full_messages[0]}" end end @@ -19,7 +20,7 @@ def destroy @conservation_record = ConservationRecord.find(params[:conservation_record_id]) @repair_record = @conservation_record.in_house_repair_records.find(params[:id]) @repair_record.destroy - redirect_to conservation_record_path(@conservation_record) + redirect_to "#{conservation_record_path(@conservation_record)}#in-house-repairs" end private diff --git a/app/controllers/treatment_reports_controller.rb b/app/controllers/treatment_reports_controller.rb index 1bbb11dd..b42fdf75 100644 --- a/app/controllers/treatment_reports_controller.rb +++ b/app/controllers/treatment_reports_controller.rb @@ -7,14 +7,15 @@ def create @treatment_report.save flash - redirect_to conservation_record_path(@treatment_report.conservation_record), notice: 'Treatment record saved successfully!' + redirect_to "#{conservation_record_path(@treatment_report.conservation_record)}#treatment-report-tab", notice: 'Treatment record saved successfully!' end def update @treatment_report = TreatmentReport.find(params[:id]) @treatment_report.update(treatment_report_params) - redirect_to conservation_record_path(@treatment_report.conservation_record), notice: 'Treatment Record updated successfully!' + redirect_to "#{conservation_record_path(@treatment_report.conservation_record)}#treatment-report-tab", + notice: 'Treatment Record updated successfully!' end private diff --git a/app/views/conservation_records/show.html.erb b/app/views/conservation_records/show.html.erb index e0c59e70..172a7851 100644 --- a/app/views/conservation_records/show.html.erb +++ b/app/views/conservation_records/show.html.erb @@ -63,7 +63,7 @@

-

In-House Repairs

+

In-House Repairs

<% if can? :crud, InHouseRepairRecord %> diff --git a/spec/controllers/con_tech_records_controller_spec.rb b/spec/controllers/con_tech_records_controller_spec.rb index 03f5e3fe..e2bebded 100644 --- a/spec/controllers/con_tech_records_controller_spec.rb +++ b/spec/controllers/con_tech_records_controller_spec.rb @@ -23,7 +23,7 @@ describe 'POST #create' do it 'creates a new conservators and technicians record' do post :create, params: { con_tech_record: valid_attributes, conservation_record_id: conservation_record.id } - expect(response).to redirect_to(conservation_record) + expect(response).to redirect_to("#{conservation_record_path(conservation_record)}#conservators-and-technicians") end end @@ -33,6 +33,7 @@ expect do delete :destroy, params: { id: con_tech_record.to_param, conservation_record_id: conservation_record.id } end.to change(ConTechRecord, :count).by(-1) + expect(response).to redirect_to("#{conservation_record_path(conservation_record)}#conservators-and-technicians") end end end diff --git a/spec/controllers/cost_return_reports_controller_spec.rb b/spec/controllers/cost_return_reports_controller_spec.rb index 8e31f229..c6f36e67 100644 --- a/spec/controllers/cost_return_reports_controller_spec.rb +++ b/spec/controllers/cost_return_reports_controller_spec.rb @@ -30,7 +30,7 @@ it 'creates a new cost return report record' do conservation_record = create(:conservation_record) post :create, params: { conservation_record_id: conservation_record.id, cost_return_report: valid_attributes } - expect(response).to redirect_to(conservation_record_path(conservation_record)) + expect(response).to redirect_to("#{conservation_record_path(conservation_record)}#cost-and-return-information") end end end @@ -41,6 +41,7 @@ expect do delete :destroy, params: { conservation_record_id: conservation_record.id, id: cost_return_report.to_param } end.to change(CostReturnReport, :count).by(-1) + expect(response).to redirect_to("#{conservation_record_path(conservation_record)}#cost-and-return-information") end end @@ -60,6 +61,7 @@ it 'updates Cost Return Report' do cost_return_report = CostReturnReport.create! valid_attributes put :update, params: { conservation_record_id: conservation_record.id, id: cost_return_report.to_param, cost_return_report: new_attributes } + expect(response).to redirect_to("#{conservation_record_path(conservation_record)}#cost-and-return-information") cost_return_report.reload expect(cost_return_report.repair_estimate).to eq(110.10) expect(cost_return_report.repair_cost).to eq(130.10) diff --git a/spec/controllers/external_repair_records_controller_spec.rb b/spec/controllers/external_repair_records_controller_spec.rb index a12526b1..da257e80 100644 --- a/spec/controllers/external_repair_records_controller_spec.rb +++ b/spec/controllers/external_repair_records_controller_spec.rb @@ -26,7 +26,14 @@ describe 'POST #create' do it 'creates a new in house repair record' do post :create, params: { external_repair_record: valid_attributes, conservation_record_id: conservation_record.id } - expect(response).to redirect_to(conservation_record) + expect(response).to redirect_to("#{conservation_record_path(conservation_record)}#external-repairs") + end + + it 'validates for required params' do + valid_attributes.delete(:repair_type) + post :create, params: { external_repair_record: valid_attributes, conservation_record_id: conservation_record.id } + expect(response).to redirect_to("#{conservation_record_path(conservation_record)}#external-repairs") + expect(subject.request.flash[:notice]).to have_content('External repair not save') end end @@ -36,6 +43,7 @@ expect do delete :destroy, params: { id: external_repair_record.to_param, conservation_record_id: conservation_record.id } end.to change(ExternalRepairRecord, :count).by(-1) + expect(response).to redirect_to("#{conservation_record_path(conservation_record)}#external-repairs") end end end diff --git a/spec/controllers/in_house_repair_records_controller_spec.rb b/spec/controllers/in_house_repair_records_controller_spec.rb index a559a35f..3a71539e 100644 --- a/spec/controllers/in_house_repair_records_controller_spec.rb +++ b/spec/controllers/in_house_repair_records_controller_spec.rb @@ -40,7 +40,7 @@ describe 'POST #create' do it 'creates a new in house repair record' do post :create, params: { in_house_repair_record: valid_attributes, conservation_record_id: conservation_record.id } - expect(response).to redirect_to(conservation_record) + expect(response).to redirect_to("#{conservation_record_path(conservation_record)}#in-house-repairs") end it 'does not have valid staff code to create in house repair record' do @@ -55,6 +55,7 @@ expect do delete :destroy, params: { id: in_house_repair_record.to_param, conservation_record_id: conservation_record.id } end.to change(InHouseRepairRecord, :count).by(-1) + expect(response).to redirect_to("#{conservation_record_path(conservation_record)}#in-house-repairs") end end end diff --git a/spec/controllers/treatment_reports_controller_spec.rb b/spec/controllers/treatment_reports_controller_spec.rb index 6feea8c9..244abba9 100644 --- a/spec/controllers/treatment_reports_controller_spec.rb +++ b/spec/controllers/treatment_reports_controller_spec.rb @@ -49,7 +49,7 @@ it 'creates a new conservation record' do conservation_record = create(:conservation_record) post :create, params: { conservation_record_id: conservation_record.id, treatment_report: valid_attributes } - expect(response).to redirect_to(conservation_record_path(conservation_record)) + expect(response).to redirect_to("#{conservation_record_path(conservation_record)}#treatment-report-tab") end end end @@ -90,6 +90,7 @@ it 'updates the Treatment Report' do treatment_report = TreatmentReport.create! valid_attributes put :update, params: { conservation_record_id: conservation_record.id, id: treatment_report.to_param, treatment_report: new_attributes } + expect(response).to redirect_to("#{conservation_record_path(conservation_record)}#treatment-report-tab") treatment_report.reload expect(treatment_report.description_primary_support).to eq('Description Support') end