diff --git a/Gemfile b/Gemfile index 6fde29b3..0bdc3634 100644 --- a/Gemfile +++ b/Gemfile @@ -15,13 +15,10 @@ gem 'pg' # Use Puma as the app server gem 'puma', '~> 3.0' # Use SCSS for stylesheets -gem 'sass-rails', '>= 5.0.6' +gem 'sassc-rails' # Use Uglifier as compressor for JavaScript assets gem 'uglifier', '>= 1.3.0' -# Use CoffeeScript for .coffee assets and views -# gem 'coffee-rails', '~> 5.0' # See https://github.com/rails/execjs#readme for more supported runtimes -# gem 'therubyracer', platforms: :ruby # Use jquery as the JavaScript library gem 'jquery-rails' diff --git a/Gemfile.lock b/Gemfile.lock index a7260cc5..eebdee5b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -101,7 +101,6 @@ GEM launchy (2.5.0) addressable (~> 2.7) libv8 (3.16.14.19) - libv8 (3.16.14.19-x86_64-linux) listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -194,8 +193,6 @@ GEM sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sass-rails (6.0.0) - sassc-rails (~> 2.1, >= 2.1.1) sassc (2.4.0) ffi (~> 1.9) sassc-rails (2.1.2) @@ -276,7 +273,7 @@ DEPENDENCIES rails (~> 5.1.7) rails-controller-testing rspec-rails (~> 4.1.2) - sass-rails (>= 5.0.6) + sassc-rails seed_dump spring spring-watcher-listen (~> 2.0.0) diff --git a/spec/controllers/districts_controller_spec.rb b/spec/controllers/districts_controller_spec.rb index 4926bd62..55df5344 100644 --- a/spec/controllers/districts_controller_spec.rb +++ b/spec/controllers/districts_controller_spec.rb @@ -6,7 +6,7 @@ RSpec.describe DistrictsController, type: :controller do # District. As you add validations to District, be sure to # adjust the attributes here as well. let(:valid_attributes) { - {name: 'District'} + {name: 'Milford'} } let(:invalid_attributes) { diff --git a/spec/views/districts/show.html.erb_spec.rb b/spec/views/districts/show.html.erb_spec.rb index a997b88d..c1890f56 100644 --- a/spec/views/districts/show.html.erb_spec.rb +++ b/spec/views/districts/show.html.erb_spec.rb @@ -3,7 +3,7 @@ require 'rails_helper' RSpec.describe "districts/show", type: :view do before(:each) do @district = assign(:district, District.create!( - :name => "District Name", + :name => "Milford", :state_id => 2 )) @@ -14,7 +14,7 @@ RSpec.describe "districts/show", type: :view do it "renders attributes in

" do render - expect(rendered).to match(/District Name/) + expect(rendered).to match(/Milford/) expect(rendered).to match(/2/) 3.times do |i| expect(rendered).to match(/School #{i}/)