From edb1548593b47880a3b8fa245bf6e82de695828d Mon Sep 17 00:00:00 2001 From: Alex Basson Date: Wed, 22 Sep 2021 14:25:22 -0400 Subject: [PATCH] Include measure 2A-i on the graph; TODO: load student survey responses --- app/controllers/dashboard_controller.rb | 2 +- .../features/school_dashboard_feature_spec.rb | 23 +++++++++++++------ 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb index c77d83bb..b188505f 100644 --- a/app/controllers/dashboard_controller.rb +++ b/app/controllers/dashboard_controller.rb @@ -9,7 +9,7 @@ class DashboardController < ApplicationController private def measure_ids - %w(1A-i) + %w(1A-i 2A-i) end def presenter_for_measure(measure) diff --git a/spec/features/school_dashboard_feature_spec.rb b/spec/features/school_dashboard_feature_spec.rb index a61f19ae..80a891a8 100644 --- a/spec/features/school_dashboard_feature_spec.rb +++ b/spec/features/school_dashboard_feature_spec.rb @@ -4,18 +4,24 @@ feature "School dashboard", type: feature do let(:district) { District.find_by_slug 'winchester' } let(:school) { School.find_by_slug 'winchester-high-school' } - let(:measure) { Measure.find_by_measure_id('1A-i') } + let(:measure_1A_i) { Measure.find_by_measure_id('1A-i') } + let(:measure_2A_i) { Measure.find_by_measure_id('2A-i') } - let(:survey_item_1_for_measure) { SurveyItem.create measure: measure, survey_item_id: '1' } - let(:survey_item_2_for_measure) { SurveyItem.create measure: measure, survey_item_id: '2' } + let(:survey_item_1_for_measure_1A_i) { SurveyItem.create measure: measure_1A_i, survey_item_id: rand.to_s } + let(:survey_item_2_for_measure_1A_i) { SurveyItem.create measure: measure_1A_i, survey_item_id: rand.to_s } + let(:survey_item_1_for_measure_2A_i) { SurveyItem.create measure: measure_2A_i, survey_item_id: rand.to_s } + let(:survey_item_2_for_measure_2A_i) { SurveyItem.create measure: measure_2A_i, survey_item_id: rand.to_s } let(:measure_row_bars) { page.all('rect.measure-row-bar') } let(:ay_2020_21) { AcademicYear.find_by_range '2020-21' } before :each do - SurveyItemResponse.create response_id: '123abc', academic_year: ay_2020_21, school: school, survey_item: survey_item_1_for_measure, likert_score: 4 - SurveyItemResponse.create response_id: '456efg', academic_year: ay_2020_21, school: school, survey_item: survey_item_2_for_measure, likert_score: 5 + SurveyItemResponse.create response_id: '123abc', academic_year: ay_2020_21, school: school, survey_item: survey_item_1_for_measure_1A_i, likert_score: 4 + SurveyItemResponse.create response_id: '456efg', academic_year: ay_2020_21, school: school, survey_item: survey_item_2_for_measure_1A_i, likert_score: 5 + + SurveyItemResponse.create response_id: '123abc', academic_year: ay_2020_21, school: school, survey_item: survey_item_1_for_measure_2A_i, likert_score: 5 + SurveyItemResponse.create response_id: '456efg', academic_year: ay_2020_21, school: school, survey_item: survey_item_2_for_measure_2A_i, likert_score: 5 end scenario "User authentication fails" do @@ -36,9 +42,12 @@ feature "School dashboard", type: feature do expect(page).to have_select('school', selected: 'Winchester High School') expect(page).to have_text(school.name) + expect(page).to have_text('Professional Qualifications') - first_row_bar = measure_row_bars.first - expect(first_row_bar['width']).to eq '20.66%' + expect(measure_row_bars[0]['width']).to eq '20.66%' + + expect(page).to have_text('Student Physical Safety') + expect(measure_row_bars[1]['width']).to eq '50.0%' end let(:username) { 'winchester' }