Include measure 2A-i on the graph; TODO: load student survey responses

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)

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_1_for_measure_1A_i) { SurveyItem.create measure: measure_1A_i, survey_item_id: rand.to_s }
-  let(:survey_item_2_for_measure) { SurveyItem.create measure: measure, survey_item_id: '2' }
+  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: '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, likert_score: 5
+    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(measure_row_bars[0]['width']).to eq '20.66%'
-    expect(first_row_bar['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' }