Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

update to Rails 3.2.9

also make all tests go green
  • Loading branch information...
commit b1ee093dd6fa50ff1213c70951846bf0362428ea 1 parent 40e9a9b
@agrobbin authored
View
2  Gemfile
@@ -13,7 +13,7 @@ gem 'omniauth', '1.1.1'
gem 'omniauth-google-oauth2', '0.1.13'
gem 'paper_trail', '2.6.3'
gem 'paperclip', '3.3.1'
-gem 'rails', '3.2.8'
+gem 'rails', '3.2.9'
gem 'sendgrid-rails', '2.0.2'
gem 'unicorn', '4.4.0'
View
57 Gemfile.lock
@@ -8,31 +8,31 @@ PATH
GEM
remote: https://rubygems.org/
specs:
- actionmailer (3.2.8)
- actionpack (= 3.2.8)
+ actionmailer (3.2.9)
+ actionpack (= 3.2.9)
mail (~> 2.4.4)
- actionpack (3.2.8)
- activemodel (= 3.2.8)
- activesupport (= 3.2.8)
+ actionpack (3.2.9)
+ activemodel (= 3.2.9)
+ activesupport (= 3.2.9)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
rack (~> 1.4.0)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.1.3)
- activemodel (3.2.8)
- activesupport (= 3.2.8)
+ sprockets (~> 2.2.1)
+ activemodel (3.2.9)
+ activesupport (= 3.2.9)
builder (~> 3.0.0)
- activerecord (3.2.8)
- activemodel (= 3.2.8)
- activesupport (= 3.2.8)
+ activerecord (3.2.9)
+ activemodel (= 3.2.9)
+ activesupport (= 3.2.9)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.8)
- activemodel (= 3.2.8)
- activesupport (= 3.2.8)
- activesupport (3.2.8)
+ activeresource (3.2.9)
+ activemodel (= 3.2.9)
+ activesupport (= 3.2.9)
+ activesupport (3.2.9)
i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.3.2)
@@ -148,23 +148,23 @@ GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.8)
- actionmailer (= 3.2.8)
- actionpack (= 3.2.8)
- activerecord (= 3.2.8)
- activeresource (= 3.2.8)
- activesupport (= 3.2.8)
+ rails (3.2.9)
+ actionmailer (= 3.2.9)
+ actionpack (= 3.2.9)
+ activerecord (= 3.2.9)
+ activeresource (= 3.2.9)
+ activesupport (= 3.2.9)
bundler (~> 1.0)
- railties (= 3.2.8)
- railties (3.2.8)
- actionpack (= 3.2.8)
- activesupport (= 3.2.8)
+ railties (= 3.2.9)
+ railties (3.2.9)
+ actionpack (= 3.2.9)
+ activesupport (= 3.2.9)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
raindrops (0.10.0)
- rake (0.9.2.2)
+ rake (10.0.0)
rdoc (3.12)
json (~> 1.4)
rspec (2.11.0)
@@ -195,8 +195,9 @@ GEM
multi_json (~> 1.0)
simplecov-html (~> 0.7.1)
simplecov-html (0.7.1)
- sprockets (2.1.3)
+ sprockets (2.2.1)
hike (~> 1.2)
+ multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
therubyracer (0.10.2)
@@ -249,7 +250,7 @@ DEPENDENCIES
omniauth-google-oauth2 (= 0.1.13)
paper_trail (= 2.6.3)
paperclip (= 3.3.1)
- rails (= 3.2.8)
+ rails (= 3.2.9)
rspec-rails (= 2.11.4)
rvm-capistrano (= 1.2.7)
sass-rails (= 3.2.5)
View
15 doc/brainstorming.txt
@@ -1,8 +1,7 @@
-1. Notification email alerts to students
-2. Documents with google drive
-3. Assignments/tests/quizzes/etc. pushed to google calendar
-4. Submitting assignments (via drag-and-drop)
-5. Taking tests/quizzes
-6. Posting grades
-7. Calendar alerts for assignments/events
-8. Contacting classmates/professor
+1. Documents with google drive
+2. Assignments/tests/quizzes/etc. pushed to google calendar
+3. Submitting assignments (via drag-and-drop)
+4. Taking tests/quizzes
+5. Posting grades
+6. Calendar alerts for assignments/events
+7. Contacting classmates/professor
View
2  spec/models/document_spec.rb
@@ -23,7 +23,7 @@
it "should fall back to the upload's basename if no name is passed" do
@document.name = nil
@document.save
- @document.name.should == 'institution'
+ @document.name.should == 'Institution'
end
context "when scoped by ordered" do
View
5 spec/models/notification_spec.rb
@@ -4,8 +4,9 @@
before(:each) do
@event = stub_model(Event)
+ @user = stub_model(Student, institution: stub_model(Institution))
@notification = Notification.new(
- user: stub_model(Student),
+ user: @user,
resource: @event,
text: 'Test notification.',
url: '/tests/1'
@@ -30,6 +31,7 @@
it "should only find unread notifications" do
@new_notification = @notification.dup
+ @new_notification.user = @user
@new_notification.read = true
@new_notification.save
@notification.save
@@ -47,6 +49,7 @@
].each do |since|
it "should only find ones created since #{since}" do
@new_notification = @notification.dup
+ @new_notification.user = @user
@new_notification.save
@notification.created_at = since - 1
@notification.save
Please sign in to comment.
Something went wrong with that request. Please try again.