fix: fix merges from main

This commit is contained in:
Nelson Jovel 2024-11-19 19:23:22 -08:00
parent e741b60bec
commit 308efbc6dc
17 changed files with 1203 additions and 197 deletions

View file

@ -1,4 +1,4 @@
require "rails_helper"
require 'rails_helper'
include VarianceHelper
describe OverviewController, type: :controller do
@ -6,12 +6,12 @@ describe OverviewController, type: :controller do
let(:school) { create(:school) }
let(:district) { create(:district) }
let!(:categories) do
[create(:category, name: "Second", sort_index: 2), create(:category, name: "First", sort_index: 1)]
[create(:category, name: 'Second', sort_index: 2), create(:category, name: 'First', sort_index: 1)]
end
it "fetches categories sorted by sort_index" do
it 'fetches categories sorted by sort_index' do
login_as district
get :index, params: { school_id: school.to_param, district_id: district.to_param }
get :index, params: { school_id: school.to_param, district_id: district.to_param }
expect(assigns(:category_presenters).map(&:name)).to eql %w[First Second]
end
end