From 7d096748bfc575b151272f3395414432550d1bd0 Mon Sep 17 00:00:00 2001 From: cryptogopher Date: Tue, 19 Jan 2021 18:53:02 +0100 Subject: [PATCH] Test pass: test_index_options_add_exposure --- app/controllers/concerns/finders.rb | 2 +- app/controllers/goals_controller.rb | 12 ++++++++++++ app/controllers/targets_controller.rb | 6 ++++-- app/views/targets/index.js.erb | 6 ++++++ app/views/targets/toggle_exposure.js.erb | 1 + config/routes.rb | 2 +- test/system/targets_test.rb | 2 +- 7 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 app/controllers/goals_controller.rb create mode 100644 app/views/targets/index.js.erb create mode 100644 app/views/targets/toggle_exposure.js.erb diff --git a/app/controllers/concerns/finders.rb b/app/controllers/concerns/finders.rb index d0f2147..0285bf2 100644 --- a/app/controllers/concerns/finders.rb +++ b/app/controllers/concerns/finders.rb @@ -8,7 +8,7 @@ module Concerns::Finders render_404 end - def find_goal_by_project_id + def find_binding_goal_by_project_id @project = Project.find(params[:project_id]) @goal = @project.goals.binding rescue ActiveRecord::RecordNotFound diff --git a/app/controllers/goals_controller.rb b/app/controllers/goals_controller.rb new file mode 100644 index 0000000..534668f --- /dev/null +++ b/app/controllers/goals_controller.rb @@ -0,0 +1,12 @@ +class GoalsController < ApplicationController + include Concerns::Finders + + before_action :find_goal, only: [:show, :edit] + before_action :authorize + + def show + end + + def edit + end +end diff --git a/app/controllers/targets_controller.rb b/app/controllers/targets_controller.rb index 2b3ef17..bf6c766 100644 --- a/app/controllers/targets_controller.rb +++ b/app/controllers/targets_controller.rb @@ -5,11 +5,13 @@ class TargetsController < ApplicationController include Concerns::Finders - before_action :find_goal_by_project_id, only: [:index, :new, :edit] + before_action :find_binding_goal_by_project_id, only: [:index, :new, :edit] + before_action :find_project_by_project_id, only: [:create] + before_action :find_quantity_by_quantity_id, only: [:toggle_exposure] #, if: ->{ params[:project_id].present? } #before_action :find_goal, only: [:index, :new], # unless: -> { @goal } - before_action :find_project_by_project_id, only: [:create] + before_action :find_goal, only: [:toggle_exposure] before_action :authorize #before_action :set_view_params diff --git a/app/views/targets/index.js.erb b/app/views/targets/index.js.erb new file mode 100644 index 0000000..7916f55 --- /dev/null +++ b/app/views/targets/index.js.erb @@ -0,0 +1,6 @@ +<%# case @view_params[:view] %> + <%# when :by_date %> +// $('#targets').html('<%#= j render partial: 'targets/by_effective_date' %>'); + <%# else %> + $('#targets').html('<%= j render partial: 'targets/index' %>'); +<%# end %> diff --git a/app/views/targets/toggle_exposure.js.erb b/app/views/targets/toggle_exposure.js.erb new file mode 100644 index 0000000..a2522fb --- /dev/null +++ b/app/views/targets/toggle_exposure.js.erb @@ -0,0 +1 @@ +$('#targets').html('<%= j render partial: 'targets/index' %>'); diff --git a/config/routes.rb b/config/routes.rb index 9eafb4b..9aaa5ed 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -9,7 +9,7 @@ resources :projects, shallow: true do end resources :goals, only: [:show, :edit] do member do - post 'toggle_exposure', to: 'goals#toggle_exposure' + post 'toggle_exposure', to: 'targets#toggle_exposure' end end resources :targets, except: [:show, :edit] do diff --git a/test/system/targets_test.rb b/test/system/targets_test.rb index 84fb9a1..0fdbde3 100644 --- a/test/system/targets_test.rb +++ b/test/system/targets_test.rb @@ -21,7 +21,7 @@ class TargetsTest < BodyTrackingSystemTestCase assert_selector 'div#targets', visible: :yes, exact_text: t(:label_no_data) end - def test_index_options_add_column + def test_index_options_add_exposure visit project_targets_path(@project1) assert_no_selector 'table#targets thead th', text: quantities(:quantities_proteins).name within 'fieldset#options' do