Commit f8cf0d71 authored by Zac Wood's avatar Zac Wood

Tests don't immediately crash -- still all commented out though

parent 6ee84ffe
......@@ -6,7 +6,7 @@ git_source(:github) do |repo_name|
end
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.1.6'
gem 'rails', '5.1.6.1'
# Use sqlite3 as the database for Active Record
gem 'sqlite3'
# Use Puma as the app server
......
GEM
remote: https://rubygems.org/
specs:
actioncable (5.1.6)
actionpack (= 5.1.6)
actioncable (5.1.6.1)
actionpack (= 5.1.6.1)
nio4r (~> 2.0)
websocket-driver (~> 0.6.1)
actionmailer (5.1.6)
actionpack (= 5.1.6)
actionview (= 5.1.6)
activejob (= 5.1.6)
actionmailer (5.1.6.1)
actionpack (= 5.1.6.1)
actionview (= 5.1.6.1)
activejob (= 5.1.6.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.1.6)
actionview (= 5.1.6)
activesupport (= 5.1.6)
actionpack (5.1.6.1)
actionview (= 5.1.6.1)
activesupport (= 5.1.6.1)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.1.6)
activesupport (= 5.1.6)
actionview (5.1.6.1)
activesupport (= 5.1.6.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.1.6)
activesupport (= 5.1.6)
activejob (5.1.6.1)
activesupport (= 5.1.6.1)
globalid (>= 0.3.6)
activemodel (5.1.6)
activesupport (= 5.1.6)
activerecord (5.1.6)
activemodel (= 5.1.6)
activesupport (= 5.1.6)
activemodel (5.1.6.1)
activesupport (= 5.1.6.1)
activerecord (5.1.6.1)
activemodel (= 5.1.6.1)
activesupport (= 5.1.6.1)
arel (~> 8.0)
activesupport (5.1.6)
activesupport (5.1.6.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
......@@ -57,7 +57,7 @@ GEM
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
coderay (1.1.2)
concurrent-ruby (1.0.5)
concurrent-ruby (1.1.3)
crass (1.0.4)
engtagger (0.2.1)
erubi (1.7.1)
......@@ -66,7 +66,7 @@ GEM
activesupport (>= 4.2.0)
httparty (0.16.2)
multi_xml (>= 0.5.2)
i18n (1.0.1)
i18n (1.1.1)
concurrent-ruby (~> 1.0)
icalendar (2.4.1)
jaro_winkler (1.5.1)
......@@ -77,20 +77,20 @@ GEM
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.2.2)
loofah (2.2.3)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.0)
mail (2.7.1)
mini_mime (>= 0.1.1)
maruku (0.7.3)
method_source (0.9.0)
mini_mime (1.0.0)
method_source (0.9.2)
mini_mime (1.0.1)
mini_portile2 (2.3.0)
minitest (5.11.3)
multi_json (1.13.1)
multi_xml (0.6.0)
nio4r (2.3.1)
nokogiri (1.8.3)
nokogiri (1.8.5)
mini_portile2 (~> 2.3.0)
parallel (1.12.1)
parser (2.5.1.2)
......@@ -104,30 +104,30 @@ GEM
yard (~> 0.9.11)
public_suffix (3.0.2)
puma (3.11.4)
rack (2.0.5)
rack (2.0.6)
rack-cors (1.0.2)
rack-test (1.0.0)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.1.6)
actioncable (= 5.1.6)
actionmailer (= 5.1.6)
actionpack (= 5.1.6)
actionview (= 5.1.6)
activejob (= 5.1.6)
activemodel (= 5.1.6)
activerecord (= 5.1.6)
activesupport (= 5.1.6)
rails (5.1.6.1)
actioncable (= 5.1.6.1)
actionmailer (= 5.1.6.1)
actionpack (= 5.1.6.1)
actionview (= 5.1.6.1)
activejob (= 5.1.6.1)
activemodel (= 5.1.6.1)
activerecord (= 5.1.6.1)
activesupport (= 5.1.6.1)
bundler (>= 1.3.0)
railties (= 5.1.6)
railties (= 5.1.6.1)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
railties (5.1.6)
actionpack (= 5.1.6)
activesupport (= 5.1.6)
railties (5.1.6.1)
actionpack (= 5.1.6.1)
activesupport (= 5.1.6.1)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
......@@ -177,12 +177,9 @@ GEM
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sqlite3 (1.3.13)
thor (0.20.0)
thor (0.20.3)
thread_safe (0.3.6)
tilt (2.0.8)
turbolinks (5.1.1)
turbolinks-source (~> 5.1)
turbolinks-source (5.1.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
unicode-display_width (1.4.0)
......@@ -216,7 +213,7 @@ DEPENDENCIES
pry-doc
puma (~> 3.7)
rack-cors
rails (~> 5.1.6)
rails (= 5.1.6.1)
rubocop (~> 0.58.2)
rubyXL
sass-rails (~> 5.0)
......@@ -224,7 +221,6 @@ DEPENDENCIES
spring
spring-watcher-listen (~> 2.0.0)
sqlite3
turbolinks (~> 5)
tzinfo-data
web-console (>= 3.3.0)
......
......@@ -16,7 +16,6 @@ class SessionsController < ApplicationController
@cart << section_id
end
puts @cart.to_json
cookies[:cart] = @cart.to_json
render json: @cart.to_json
end
......
require 'test_helper'
class ApplicationControllerTest < ActionDispatch::IntegrationTest
# test "redirects without semester id" do
# get "/"
# assert_response :redirect
# assert_match /\?semester_id=#{semesters(:fall2018).id}/, @response.redirect_url
# end
test "redirects without semester id" do
get "/"
assert_response :redirect
assert_match /\?semester_id=#{semesters(:fall2018).id}/, @response.redirect_url
end
end
......@@ -12,6 +12,7 @@ cs112001:
location: Innovation Hall 204
course: cs112
instructor: kinga
semester: fall2018
cs112002:
name: CS 112 002
......@@ -25,6 +26,7 @@ cs112002:
end_time: 2:00 pm
course: cs112
instructor: luke
semester: fall2018
cs211001:
name: CS 211 001
......@@ -38,6 +40,7 @@ cs211001:
location: ENGR 200
course: cs211spring
instructor: otten
semester: spring2018
cs112001spring:
name: CS 112 001
......@@ -51,6 +54,7 @@ cs112001spring:
location: Innovation Hall 204
course: cs112spring
instructor: kinga
semester: spring2018
acct110001:
name: ACCT 110 001
......@@ -64,3 +68,4 @@ acct110001:
location: Innovation Hall 204
course: acct110spring
instructor: business_man
semester: spring2018
......@@ -2,10 +2,8 @@
one:
course: one
name: MyString
score: 9.99
two:
course: two
name: MyString
score: 9.99
......@@ -3,24 +3,19 @@
cs112:
subject: CS
course_number: 112
semester: fall2018
cs211:
subject: CS
course_number: 211
semester: fall2018
acct110spring:
subject: ACCT
course_number: 110
semester: spring2018
cs110spring:
subject: CS
course_number: 110
semester: spring2018
cs112spring:
subject: CS
course_number: 112
semester: spring2018
......@@ -4,12 +4,8 @@ one:
instructor: one
tag: one
score: 9.99
course_subject: MyString
course_number: MyString
two:
instructor: two
tag: two
score: 9.99
course_subject: MyString
course_number: MyString
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment