Commit 3767b529
Changed files (3)
db/schema.rb
@@ -29,18 +29,18 @@ ActiveRecord::Schema.define(:version => 20121217172714) do
add_index "active_admin_comments", ["resource_type", "resource_id"], :name => "index_admin_notes_on_resource_type_and_resource_id"
create_table "admin_users", :force => true do |t|
- t.string "email", :default => "", :null => false
- t.string "encrypted_password", :default => "", :null => false
+ t.string "email", :default => "", :null => false
+ t.string "encrypted_password", :limit => 128, :default => "", :null => false
t.string "reset_password_token"
t.datetime "reset_password_sent_at"
t.datetime "remember_created_at"
- t.integer "sign_in_count", :default => 0
+ t.integer "sign_in_count", :default => 0
t.datetime "current_sign_in_at"
t.datetime "last_sign_in_at"
t.string "current_sign_in_ip"
t.string "last_sign_in_ip"
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
end
add_index "admin_users", ["email"], :name => "index_admin_users_on_email", :unique => true
@@ -55,8 +55,8 @@ ActiveRecord::Schema.define(:version => 20121217172714) do
create_table "categories", :force => true do |t|
t.string "name"
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
+ t.datetime "created_at"
+ t.datetime "updated_at"
t.string "slug"
end
@@ -80,8 +80,8 @@ ActiveRecord::Schema.define(:version => 20121217172714) do
create_table "creations", :force => true do |t|
t.string "name"
t.text "story"
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
+ t.datetime "created_at"
+ t.datetime "updated_at"
t.integer "user_id"
t.string "image"
t.boolean "is_restricted", :default => false, :null => false
@@ -114,8 +114,8 @@ ActiveRecord::Schema.define(:version => 20121217172714) do
create_table "favorites", :force => true do |t|
t.integer "user_id"
t.integer "creation_id"
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
+ t.datetime "created_at"
+ t.datetime "updated_at"
end
create_table "interests", :force => true do |t|
@@ -127,8 +127,8 @@ ActiveRecord::Schema.define(:version => 20121217172714) do
create_table "photos", :force => true do |t|
t.integer "creation_id"
t.string "image"
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
+ t.datetime "created_at"
+ t.datetime "updated_at"
end
add_index "photos", ["creation_id"], :name => "index_photos_on_creation_id"
@@ -163,18 +163,18 @@ ActiveRecord::Schema.define(:version => 20121217172714) do
end
create_table "users", :force => true do |t|
- t.string "email", :default => "", :null => false
- t.string "encrypted_password", :default => "", :null => false
+ t.string "email", :default => "", :null => false
+ t.string "encrypted_password", :limit => 128, :default => "", :null => false
t.string "reset_password_token"
t.datetime "reset_password_sent_at"
t.datetime "remember_created_at"
- t.integer "sign_in_count", :default => 0
+ t.integer "sign_in_count", :default => 0
t.datetime "current_sign_in_at"
t.datetime "last_sign_in_at"
t.string "current_sign_in_ip"
t.string "last_sign_in_ip"
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
+ t.datetime "created_at"
+ t.datetime "updated_at"
t.string "name"
t.string "website"
t.string "twitter"
spec/spec_helper.rb
@@ -20,6 +20,11 @@ Spork.prefork do
config.infer_base_class_for_anonymous_controllers = false
config.include DeviseHelper, :type => :controller
end
+ module ::RSpec::Core
+ class ExampleGroup
+ include Capybara::DSL
+ end
+ end
end
Spork.each_run do
Gemfile.lock
@@ -1,20 +1,20 @@
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.2.8)
- actionpack (= 3.2.8)
+ actionmailer (3.2.11)
+ actionpack (= 3.2.11)
mail (~> 2.4.4)
- actionpack (3.2.8)
- activemodel (= 3.2.8)
- activesupport (= 3.2.8)
+ actionpack (3.2.11)
+ activemodel (= 3.2.11)
+ activesupport (= 3.2.11)
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)
- activeadmin (0.5.0)
+ sprockets (~> 2.2.1)
+ activeadmin (0.5.1)
arbre (>= 1.0.1)
bourbon (>= 1.0.0)
devise (>= 1.1.2)
@@ -26,18 +26,18 @@ GEM
meta_search (>= 0.9.2)
rails (>= 3.0.0)
sass (>= 3.1.0)
- activemodel (3.2.8)
- activesupport (= 3.2.8)
+ activemodel (3.2.11)
+ activesupport (= 3.2.11)
builder (~> 3.0.0)
- activerecord (3.2.8)
- activemodel (= 3.2.8)
- activesupport (= 3.2.8)
+ activerecord (3.2.11)
+ activemodel (= 3.2.11)
+ activesupport (= 3.2.11)
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.11)
+ activemodel (= 3.2.11)
+ activesupport (= 3.2.11)
+ activesupport (3.2.11)
i18n (~> 0.6)
multi_json (~> 1.0)
acts-as-taggable-on (2.3.3)
@@ -54,11 +54,11 @@ GEM
activerecord (>= 3.0.0)
bcrypt-ruby (3.0.1)
bootstrap-sass (2.1.0.0)
- bourbon (2.1.2)
- sass (>= 3.2)
+ bourbon (3.0.1)
+ sass (>= 3.2.0)
thor
builder (3.0.4)
- capistrano (2.13.5)
+ capistrano (2.14.1)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
@@ -69,17 +69,17 @@ GEM
capistrano-gitflow (1.4.3)
capistrano
stringex
- capybara (1.1.3)
+ capybara (2.0.2)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
- xpath (~> 0.1.4)
- carrierwave (0.7.1)
+ xpath (~> 1.0.0)
+ carrierwave (0.8.0)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
- carrierwave_backgrounder (0.0.8)
+ carrierwave_backgrounder (0.1.3)
carrierwave (~> 0.5)
childprocess (0.3.6)
ffi (~> 1.0, >= 1.0.6)
@@ -98,7 +98,7 @@ GEM
activerecord (>= 2.1.0, < 4)
delayed_job (~> 3.0)
developwithpassion_arrays (0.0.1)
- devise (2.1.2)
+ devise (2.2.1)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.1)
railties (~> 3.1)
@@ -112,7 +112,7 @@ GEM
exception_notification (3.0.0)
actionmailer (>= 3.0.4)
tinder (~> 1.8)
- excon (0.16.7)
+ excon (0.16.10)
execjs (1.4.0)
multi_json (~> 1.0)
factory_girl (4.1.0)
@@ -130,8 +130,8 @@ GEM
faraday_middleware (0.9.0)
faraday (>= 0.7.4, < 0.9)
fastercsv (1.5.5)
- ffi (1.1.5)
- fog (1.7.0)
+ ffi (1.3.1)
+ fog (1.8.0)
builder
excon (~> 0.14)
formatador (~> 0.2.0)
@@ -144,23 +144,22 @@ GEM
formatador (0.2.4)
formtastic (2.2.1)
actionpack (>= 3.0)
- guard (1.5.4)
- listen (>= 0.4.2)
+ guard (1.6.1)
+ listen (>= 0.6.0)
lumberjack (>= 1.0.2)
pry (>= 0.9.10)
thor (>= 0.14.6)
- guard-livereload (1.1.0)
+ guard-livereload (1.1.3)
em-websocket (>= 0.2.0)
guard (>= 1.5.0)
multi_json (~> 1.0)
- guard-rspec (2.1.1)
+ guard-rspec (2.3.3)
guard (>= 1.1)
rspec (~> 2.11)
- guard-spork (1.2.3)
+ guard-spork (1.4.1)
childprocess (>= 0.2.3)
guard (>= 1.1)
spork (>= 0.8.4)
- sys-proctable
has_scope (0.5.1)
hashie (1.2.0)
highline (1.6.15)
@@ -170,26 +169,27 @@ GEM
inherited_resources (1.3.1)
has_scope (~> 0.5.0)
responders (~> 0.6)
- jasmine (1.2.1)
- jasmine-core (>= 1.2.0)
+ jasmine (1.3.1)
+ jasmine-core (~> 1.3.1)
rack (~> 1.0)
rspec (>= 1.3.1)
selenium-webdriver (>= 0.1.3)
- jasmine-core (1.2.0)
+ jasmine-core (1.3.1)
journey (1.0.4)
- jquery-fileupload-rails (0.3.5)
+ jquery-fileupload-rails (0.4.0)
actionpack (>= 3.1)
railties (>= 3.1)
- jquery-rails (2.1.3)
- railties (>= 3.1.0, < 5.0)
- thor (~> 0.14)
- json (1.7.5)
+ jquery-rails (2.1.4)
+ railties (>= 3.0, < 5.0)
+ thor (>= 0.14, < 2.0)
+ json (1.7.6)
kaminari (0.14.1)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
- libwebsocket (0.1.5)
+ libwebsocket (0.1.7.1)
addressable
- listen (0.5.3)
+ websocket
+ listen (0.7.2)
lumberjack (1.0.2)
mail (2.4.4)
i18n (>= 0.4.0)
@@ -202,17 +202,17 @@ GEM
polyamorous (~> 0.5.0)
method_source (0.8.1)
mime-types (1.19)
- multi_json (1.3.7)
+ multi_json (1.5.0)
multipart-post (1.1.5)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
net-sftp (2.0.5)
net-ssh (>= 2.0.9)
- net-ssh (2.6.1)
+ net-ssh (2.6.3)
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
- newrelic_rpm (3.5.0.1)
- nokogiri (1.5.5)
+ newrelic_rpm (3.5.5.38)
+ nokogiri (1.5.6)
orm_adapter (0.4.0)
pg (0.14.1)
polyamorous (0.5.0)
@@ -222,58 +222,60 @@ GEM
coderay (~> 1.0.5)
method_source (~> 0.8)
slop (~> 3.3.1)
- rack (1.4.1)
+ rack (1.4.3)
rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.2)
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.11)
+ actionmailer (= 3.2.11)
+ actionpack (= 3.2.11)
+ activerecord (= 3.2.11)
+ activeresource (= 3.2.11)
+ activesupport (= 3.2.11)
bundler (~> 1.0)
- railties (= 3.2.8)
- railties (3.2.8)
- actionpack (= 3.2.8)
- activesupport (= 3.2.8)
+ railties (= 3.2.11)
+ railties (3.2.11)
+ actionpack (= 3.2.11)
+ activesupport (= 3.2.11)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
- rake (0.9.2.2)
+ rake (10.0.3)
rb-readline (0.4.2)
rdoc (3.12)
json (~> 1.4)
responders (0.9.3)
railties (~> 3.1)
rmagick (2.13.1)
- rspec (2.11.0)
- rspec-core (~> 2.11.0)
- rspec-expectations (~> 2.11.0)
- rspec-mocks (~> 2.11.0)
- rspec-core (2.11.1)
- rspec-expectations (2.11.3)
+ rspec (2.12.0)
+ rspec-core (~> 2.12.0)
+ rspec-expectations (~> 2.12.0)
+ rspec-mocks (~> 2.12.0)
+ rspec-core (2.12.2)
+ rspec-expectations (2.12.1)
diff-lcs (~> 1.1.3)
- rspec-mocks (2.11.3)
- rspec-rails (2.11.4)
+ rspec-mocks (2.12.1)
+ rspec-rails (2.12.1)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
- rspec (~> 2.11.0)
+ rspec-core (~> 2.12.0)
+ rspec-expectations (~> 2.12.0)
+ rspec-mocks (~> 2.12.0)
ruby-hmac (0.4.0)
rubyzip (0.9.9)
rvm-capistrano (1.2.7)
capistrano (>= 2.0.0)
- sass (3.2.3)
+ sass (3.2.5)
sass-rails (3.2.5)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
- selenium-webdriver (2.26.0)
+ selenium-webdriver (2.27.2)
childprocess (>= 0.2.5)
libwebsocket (~> 0.1.3)
multi_json (~> 1.0)
@@ -285,24 +287,23 @@ GEM
simplecov-html (0.7.1)
slop (3.3.3)
spork (0.9.2)
- sprockets (2.1.3)
+ sprockets (2.2.2)
hike (~> 1.2)
+ multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- sqlite3 (1.3.6)
- stringex (1.4.0)
- sys-proctable (0.9.2)
+ sqlite3 (1.3.7)
+ stringex (1.5.1)
thor (0.16.0)
tilt (1.3.3)
- tinder (1.9.1)
- eventmachine (>= 0.12.0, < 2)
+ tinder (1.9.2)
+ eventmachine (~> 1.0)
faraday (~> 0.8)
- faraday_middleware (~> 0.8)
+ faraday_middleware (~> 0.9)
hashie (~> 1.0)
- json (~> 1.6)
- mime-types (~> 1.16)
- multi_json (~> 1.0)
- multipart-post (~> 1.1)
+ json (~> 1.7.5)
+ mime-types (~> 1.19)
+ multi_json (~> 1.5)
twitter-stream (~> 0.1)
treetop (1.4.12)
polyglot
@@ -317,7 +318,8 @@ GEM
multi_json (~> 1.0, >= 1.0.2)
warden (1.2.1)
rack (>= 1.0)
- xpath (0.1.4)
+ websocket (1.0.6)
+ xpath (1.0.0)
nokogiri (~> 1.3)
PLATFORMS