diff options
| author | Guillaume | 2017-09-26 16:29:20 +0200 |
|---|---|---|
| committer | Guillaume | 2017-09-26 16:29:20 +0200 |
| commit | efce9eac3812c005409ce87028877e4a40724949 (patch) | |
| tree | 60d9269402b9ee2738fbf3251fc6ced8a18c7f64 | |
| parent | 1488ced811f3b1ec2f3d3b8e4d1a48f4fb35f91f (diff) | |
| download | chouette-core-efce9eac3812c005409ce87028877e4a40724949.tar.bz2 | |
show compliance_control_set in compliance_check_set table, fix compliance_check_set spec
| -rw-r--r-- | app/views/compliance_check_sets/index.html.slim | 2 | ||||
| -rw-r--r-- | spec/controllers/compliance_check_sets_controller_spec.rb | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/app/views/compliance_check_sets/index.html.slim b/app/views/compliance_check_sets/index.html.slim index cad20172b..e33905fce 100644 --- a/app/views/compliance_check_sets/index.html.slim +++ b/app/views/compliance_check_sets/index.html.slim @@ -40,7 +40,7 @@ ), \ TableBuilderHelper::Column.new(\ key: :control_game, \ - attribute: 'control_game' \ + attribute: Proc.new{ |n| (n.compliance_control_set.name) if n.compliance_control_set} \ ), \ ], sortable: true, diff --git a/spec/controllers/compliance_check_sets_controller_spec.rb b/spec/controllers/compliance_check_sets_controller_spec.rb index 5f5cea82f..804b0a658 100644 --- a/spec/controllers/compliance_check_sets_controller_spec.rb +++ b/spec/controllers/compliance_check_sets_controller_spec.rb @@ -5,18 +5,16 @@ RSpec.describe ComplianceCheckSetsController, type: :controller do let(:compliance_check_set) { create :compliance_check_set } - workbench_compliance_check_sets_path(current_offer_workbench) - describe "GET show" do it 'should be successful' do - get :show, id: compliance_check_set.id + get :show, workbench_id: compliance_check_set.workbench.id, id: compliance_check_set.id expect(response).to be_success end end describe "GET index" do it 'should be successful' do - get :index, id: compliance_check_set.id + get :index, workbench_id: compliance_check_set.workbench.id, id: compliance_check_set.id expect(response).to be_success end end |
