Updating with latest master.

Needed to turn Base -> Decorator, and also add the test db back to the repo so that travis will have a copy.
2012-10-19 14:14:18 -03:00 · 2012-10-19 14:14:18 -03:00 · 9f869ab84c
parent eddebf8cdc
commit 9f869ab84c
3 changed files with 1 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -12,4 +12,3 @@ vendor/bundle
 *.swo
 *.DS_Store
 spec/dummy/log/*
-spec/dummy/db/*.sqlite3
--- a/spec/dummy/app/decorators/post_decorator.rb
+++ b/spec/dummy/app/decorators/post_decorator.rb
@ -1,4 +1,4 @@
-class PostDecorator < Draper::Base
+class PostDecorator < Draper::Decorator
  decorates :post

  def posted_date
--- a/spec/dummy/db/test.sqlite3
+++ b/spec/dummy/db/test.sqlite3