From dcade06ce23ffba989336b483ede09168256a781 Mon Sep 17 00:00:00 2001 From: rebuilt Date: Tue, 21 Mar 2023 16:16:07 -0700 Subject: [PATCH] Fix failing tests --- app/models/district.rb | 4 ++++ spec/models/district_spec.rb | 15 +++++++++++++++ spec/support/basic_auth_helper.rb | 4 ++-- spec/system/journey_spec.rb | 7 ++++--- spec/system/sqm_application_spec.rb | 2 +- 5 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 spec/models/district_spec.rb diff --git a/app/models/district.rb b/app/models/district.rb index eefbb4ab..d8596489 100644 --- a/app/models/district.rb +++ b/app/models/district.rb @@ -18,4 +18,8 @@ class District < ApplicationRecord def self.boston District.find_by_name('Boston') end + + def short_name + name.split(" ").first.downcase + end end diff --git a/spec/models/district_spec.rb b/spec/models/district_spec.rb new file mode 100644 index 00000000..f7ba67c6 --- /dev/null +++ b/spec/models/district_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +RSpec.describe District, type: :model do + let(:lowell) { create(:district, name: "Lowell public schools") } + let(:lee) { create(:district, name: "Lee public schools") } + let(:maynard) { create(:district, name: "Maynard public schools") } + + context '.short_name' do + it "returns the first word in lowercase of a district's name" do + expect(lowell.short_name).to eq "lowell" + expect(lee.short_name).to eq "lee" + expect(maynard.short_name).to eq "maynard" + end + end +end diff --git a/spec/support/basic_auth_helper.rb b/spec/support/basic_auth_helper.rb index 71fd021f..a2eaf1a6 100644 --- a/spec/support/basic_auth_helper.rb +++ b/spec/support/basic_auth_helper.rb @@ -1,7 +1,7 @@ module BasicAuthHelper def login_as(district) - user = district.name.downcase - pw = "#{district.name.downcase}!" + user = district.short_name + pw = "#{user}!" request.env['HTTP_AUTHORIZATION'] = ActionController::HttpAuthentication::Basic.encode_credentials(user, pw) end end diff --git a/spec/system/journey_spec.rb b/spec/system/journey_spec.rb index cfaed1af..db1c8166 100644 --- a/spec/system/journey_spec.rb +++ b/spec/system/journey_spec.rb @@ -40,8 +40,9 @@ xdescribe 'District Admin', js: true do end end - # let(:username) { 'winchester' } - # let(:password) { 'winchester!' } + let(:username) { district.short_name} + let(:password) { "#{district.short_name}!" } + let(:respondents) do respondent = Respondent.find_or_initialize_by(school:, academic_year: ay_2021_22) respondent.total_students = 8 @@ -104,7 +105,7 @@ xdescribe 'District Admin', js: true do end it 'navigates through the site' do - # page.driver.basic_authorize(username, password) + page.driver.basic_authorize(username, password) visit '/welcome' expect(page).to have_text('Teachers & Leadership') diff --git a/spec/system/sqm_application_spec.rb b/spec/system/sqm_application_spec.rb index 2cdab2de..d1d27176 100644 --- a/spec/system/sqm_application_spec.rb +++ b/spec/system/sqm_application_spec.rb @@ -48,7 +48,7 @@ describe 'SQM Application' do private def username - district.name.downcase + district.short_name end def password