Permalink
Browse files

Upgrade to Rails 3.1.6.

  • Loading branch information...
1 parent c20ae6f commit 7224ebdc3c64abef154993d399e866bc7f99c6c3 @FooBarWidget FooBarWidget committed Jun 14, 2012
View
@@ -1,6 +1,6 @@
source 'http://rubygems.org'
-gem 'rails', '3.1.3'
+gem 'rails', '3.1.6'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
@@ -30,7 +30,6 @@ end
# put test-only gems in this group so their generators
# and rake tasks are available in development mode:
group :development, :test do
- gem 'sqlite3-ruby', :require => 'sqlite3'
gem 'rspec-rails', '~> 2.4'
gem 'capybara', :require => false
gem 'capybara-webkit', :require => false
@@ -48,7 +47,5 @@ group :assets do
gem 'uglifier', '>= 1.0.3'
end
-group :production do
- gem 'mysql2'
- # gem 'pg'
-end
+gem 'mysql2'
+# gem 'pg'
View
@@ -1,36 +1,36 @@
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.1.3)
- actionpack (= 3.1.3)
- mail (~> 2.3.0)
- actionpack (3.1.3)
- activemodel (= 3.1.3)
- activesupport (= 3.1.3)
+ actionmailer (3.1.6)
+ actionpack (= 3.1.6)
+ mail (~> 2.3.3)
+ actionpack (3.1.6)
+ activemodel (= 3.1.6)
+ activesupport (= 3.1.6)
builder (~> 3.0.0)
erubis (~> 2.7.0)
i18n (~> 0.6)
- rack (~> 1.3.5)
- rack-cache (~> 1.1)
+ rack (~> 1.3.6)
+ rack-cache (~> 1.2)
rack-mount (~> 0.8.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.0.3)
- activemodel (3.1.3)
- activesupport (= 3.1.3)
+ sprockets (~> 2.0.4)
+ activemodel (3.1.6)
+ activesupport (= 3.1.6)
builder (~> 3.0.0)
i18n (~> 0.6)
- activerecord (3.1.3)
- activemodel (= 3.1.3)
- activesupport (= 3.1.3)
- arel (~> 2.2.1)
+ activerecord (3.1.6)
+ activemodel (= 3.1.6)
+ activesupport (= 3.1.6)
+ arel (~> 2.2.3)
tzinfo (~> 0.3.29)
- activeresource (3.1.3)
- activemodel (= 3.1.3)
- activesupport (= 3.1.3)
- activesupport (3.1.3)
- multi_json (~> 1.0)
+ activeresource (3.1.6)
+ activemodel (= 3.1.6)
+ activesupport (= 3.1.6)
+ activesupport (3.1.6)
+ multi_json (>= 1.0, < 1.3)
addressable (2.2.6)
- arel (2.2.1)
+ arel (2.2.3)
bcrypt-ruby (3.0.1)
bluecloth (2.2.0)
builder (3.0.0)
@@ -92,12 +92,12 @@ GEM
jquery-rails (1.0.19)
railties (~> 3.0)
thor (~> 0.14)
- json (1.6.4)
+ json (1.7.3)
launchy (2.0.5)
addressable (~> 2.2.6)
libwebsocket (0.1.3)
addressable
- mail (2.3.0)
+ mail (2.3.3)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
@@ -108,25 +108,25 @@ GEM
orm_adapter (0.0.6)
polyglot (0.3.3)
rack (1.3.6)
- rack-cache (1.1)
+ rack-cache (1.2)
rack (>= 0.4)
rack-mount (0.8.3)
rack (>= 1.0.0)
rack-ssl (1.3.2)
rack
rack-test (0.6.1)
rack (>= 1.0)
- rails (3.1.3)
- actionmailer (= 3.1.3)
- actionpack (= 3.1.3)
- activerecord (= 3.1.3)
- activeresource (= 3.1.3)
- activesupport (= 3.1.3)
+ rails (3.1.6)
+ actionmailer (= 3.1.6)
+ actionpack (= 3.1.6)
+ activerecord (= 3.1.6)
+ activeresource (= 3.1.6)
+ activesupport (= 3.1.6)
bundler (~> 1.0)
- railties (= 3.1.3)
- railties (3.1.3)
- actionpack (= 3.1.3)
- activesupport (= 3.1.3)
+ railties (= 3.1.6)
+ railties (3.1.6)
+ actionpack (= 3.1.6)
+ activesupport (= 3.1.6)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
@@ -165,19 +165,16 @@ GEM
multi_json (~> 1.0)
rubyzip
spork (0.9.0.rc9)
- sprockets (2.0.3)
+ sprockets (2.0.4)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- sqlite3 (1.3.5)
- sqlite3-ruby (1.3.3)
- sqlite3 (>= 1.3.3)
thor (0.14.6)
tilt (1.3.3)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.31)
+ tzinfo (0.3.33)
uglifier (1.1.0)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
@@ -208,11 +205,10 @@ DEPENDENCIES
jquery-rails (>= 1.0.12)
launchy
mysql2
- rails (= 3.1.3)
+ rails (= 3.1.6)
rspec-rails (~> 2.4)
sass-rails (~> 3.1.5)
schema_plus
spork (= 0.9.0.rc9)
- sqlite3-ruby
uglifier (>= 1.0.3)
will_paginate (~> 3.0.pre4)
@@ -1,10 +1,16 @@
development:
- adapter: sqlite3
- database: db/development.sqlite3
+ adapter: mysql2
+ database: juvia
+ host: localhost
+ username:
+ password:
test:
- adapter: sqlite3
- database: db/test.sqlite3
+ adapter: mysql2
+ database: juvia
+ host: localhost
+ username:
+ password:
production:
adapter: mysql2
View
@@ -21,8 +21,8 @@
t.boolean "admin", :default => false, :null => false
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
- t.index ["reset_password_token"], :name => "index_users_on_reset_password_token", :unique => true
t.index ["email"], :name => "index_users_on_email", :unique => true
+ t.index ["reset_password_token"], :name => "index_users_on_reset_password_token", :unique => true
end
create_table "sites", :force => true do |t|
@@ -36,7 +36,7 @@
t.string "akismet_key"
t.index ["key"], :name => "index_sites_on_key", :unique => true
t.index ["user_id"], :name => "index_sites_on_user_id"
- t.foreign_key ["user_id"], "users", ["id"], :on_update => :cascade, :on_delete => :cascade
+ t.foreign_key ["user_id"], "users", ["id"], :on_update => :cascade, :on_delete => :cascade, :name => "sites_ibfk_1"
end
create_table "topics", :force => true do |t|
@@ -48,7 +48,7 @@
t.datetime "last_posted_at"
t.index ["site_id", "key"], :name => "index_topics_on_site_id_and_key", :unique => true
t.index ["site_id"], :name => "index_topics_on_site_id"
- t.foreign_key ["site_id"], "sites", ["id"], :on_update => :cascade, :on_delete => :cascade
+ t.foreign_key ["site_id"], "sites", ["id"], :on_update => :cascade, :on_delete => :cascade, :name => "topics_ibfk_1"
end
create_table "comments", :force => true do |t|
@@ -62,7 +62,7 @@
t.text "content", :null => false
t.datetime "created_at", :null => false
t.index ["topic_id"], :name => "index_comments_on_topic_id"
- t.foreign_key ["topic_id"], "topics", ["id"], :on_update => :cascade, :on_delete => :cascade
+ t.foreign_key ["topic_id"], "topics", ["id"], :on_update => :cascade, :on_delete => :cascade, :name => "comments_ibfk_1"
end
end
@@ -1,142 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
-
-describe Admin::TopicsController do
- before :each do
- sign_in(kotori)
- end
-
- def create_site
- @site ||= FactoryGirl.create(:site1, :user => kotori)
- end
-
- def valid_attributes
- { :key => 'key',
- :title => 'title',
- :url => 'http://test.local/',
- :site_id => create_site.id.to_s }
- end
-
- def valid_session
- {}
- end
-
- describe "GET show" do
- it "assigns the requested topic as @topic" do
- topic = Topic.create! valid_attributes
- get :show, {:id => topic.to_param}, valid_session
- assigns(:topic).should eq(topic)
- end
- end
-
- describe "GET new" do
- it "assigns a new topic as @topic" do
- get :new, {}, valid_session
- assigns(:topic).should be_a_new(Topic)
- end
- end
-
- describe "GET edit" do
- it "assigns the requested topic as @topic" do
- topic = Topic.create! valid_attributes
- get :edit, {:id => topic.to_param}, valid_session
- assigns(:topic).should eq(topic)
- end
- end
-
- describe "POST create" do
- describe "with valid params" do
- it "creates a new Topic" do
- expect {
- post :create, {:topic => valid_attributes}, valid_session
- }.to change(Topic, :count).by(1)
- end
-
- it "assigns a newly created topic as @topic" do
- post :create, {:topic => valid_attributes}, valid_session
- assigns(:topic).should be_a(Topic)
- assigns(:topic).should be_persisted
- end
-
- it "redirects to the created topic" do
- post :create, {:topic => valid_attributes}, valid_session
- response.should redirect_to(Topic.last)
- end
- end
-
- describe "with invalid params" do
- it "assigns a newly created but unsaved topic as @topic" do
- # Trigger the behavior that occurs when invalid params are submitted
- Topic.any_instance.stub(:save).and_return(false)
- post :create, {:topic => {}}, valid_session
- assigns(:topic).should be_a_new(Topic)
- end
-
- it "re-renders the 'new' template" do
- # Trigger the behavior that occurs when invalid params are submitted
- Topic.any_instance.stub(:save).and_return(false)
- post :create, {:topic => {}}, valid_session
- response.should render_template("new")
- end
- end
- end
-
- describe "PUT update" do
- describe "with valid params" do
- it "updates the requested topic" do
- topic = Topic.create! valid_attributes
- # Assuming there are no other admin_topics in the database, this
- # specifies that the Topic created on the previous line
- # receives the :update_attributes message with whatever params are
- # submitted in the request.
- Topic.any_instance.should_receive(:update_attributes).with({'these' => 'params'})
- put :update, {:id => topic.to_param, :topic => {'these' => 'params'}}, valid_session
- end
-
- it "assigns the requested topic as @topic" do
- topic = Topic.create! valid_attributes
- put :update, {:id => topic.to_param, :topic => valid_attributes}, valid_session
- assigns(:topic).should eq(topic)
- end
-
- it "redirects to the topic" do
- topic = Topic.create! valid_attributes
- put :update, {:id => topic.to_param, :topic => valid_attributes}, valid_session
- response.should redirect_to(topic)
- end
- end
-
- describe "with invalid params" do
- it "assigns the topic as @topic" do
- topic = Topic.create! valid_attributes
- # Trigger the behavior that occurs when invalid params are submitted
- Topic.any_instance.stub(:save).and_return(false)
- put :update, {:id => topic.to_param, :topic => {}}, valid_session
- assigns(:topic).should eq(topic)
- end
-
- it "re-renders the 'edit' template" do
- topic = Topic.create! valid_attributes
- # Trigger the behavior that occurs when invalid params are submitted
- Topic.any_instance.stub(:save).and_return(false)
- put :update, {:id => topic.to_param, :topic => {}}, valid_session
- response.should render_template("edit")
- end
- end
- end
-
- describe "DELETE destroy" do
- it "destroys the requested topic" do
- topic = Topic.create! valid_attributes
- expect {
- delete :destroy, {:id => topic.to_param}, valid_session
- }.to change(Topic, :count).by(-1)
- end
-
- it "redirects to the admin_topics list" do
- topic = Topic.create! valid_attributes
- delete :destroy, {:id => topic.to_param}, valid_session
- response.should redirect_to(admin_topics_url)
- end
- end
-
-end
@@ -1,15 +0,0 @@
-require 'spec_helper'
-
-describe "admin_topics/edit" do
- before(:each) do
- @topic = assign(:topic, stub_model(Admin::Topic))
- end
-
- it "renders the edit topic form" do
- render
-
- # Run the generator again with the --webrat flag if you want to use webrat matchers
- assert_select "form", :action => admin_topics_path(@topic), :method => "post" do
- end
- end
-end
Oops, something went wrong.

0 comments on commit 7224ebd

Please sign in to comment.