add rails 3.0 support

pixeltrix · Feb 20, 2012 · 8c22b36 · 8c22b36
1 parent 9197fb9
commit 8c22b36
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 33 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,7 @@ rvm:
 gemfile:
   - gemfiles/rails-3-2.gemfile
   - gemfiles/rails-3-1.gemfile
+  - gemfiles/rails-3-0.gemfile
 before_script:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
diff --git a/Appraisals b/Appraisals
@@ -5,3 +5,7 @@ end
 appraise 'rails-3-1' do
   gem 'rails', '~> 3.1.0'
 end
+
+appraise 'rails-3-0' do
+  gem 'rails', '~> 3.0.0'
+end
diff --git a/focused_controller.gemspec b/focused_controller.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'actionpack', '~> 3.1'
+  s.add_dependency 'actionpack', '~> 3.0'
 
   s.add_development_dependency 'minitest', '~> 2.11.2'
   s.add_development_dependency 'capybara', '~> 1.1.2'

diff --git a/gemfiles/rails-3-0.gemfile b/gemfiles/rails-3-0.gemfile
@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 3.0.0"
+
+gemspec :path=>"../"
diff --git a/test/app/app/controllers/application_controller.rb b/test/app/app/controllers/application_controller.rb
@@ -1,5 +1,3 @@
 class ApplicationController < ActionController::Base
-  protect_from_forgery
-
   include FocusedController::Mixin
 end
diff --git a/test/app/app/views/layouts/application.html.erb b/test/app/app/views/layouts/application.html.erb
@@ -4,7 +4,6 @@
   <title>App</title>
   <%= stylesheet_link_tag    "application", :media => "all" %>
   <%= javascript_include_tag "application" %>
-  <%= csrf_meta_tags %>
 </head>
 <body>
 

diff --git a/test/app/config/application.rb b/test/app/config/application.rb
@@ -3,12 +3,7 @@
 require 'action_controller/railtie'
 require 'rails/test_unit/railtie'
 
-if defined?(Bundler)
-  # If you precompile assets before deploying to production, use this line
-  Bundler.require(*Rails.groups(:assets => %w(development test)))
-  # If you want your assets lazily compiled in production, use this line
-  # Bundler.require(:default, :assets, Rails.env)
-end
+Bundler.require
 
 module App
   class Application < Rails::Application

diff --git a/test/app/config/initializers/wrap_parameters.rb b/test/app/config/initializers/wrap_parameters.rb
diff --git a/test/app/spec/controllers/posts_controller_spec.rb b/test/app/spec/controllers/posts_controller_spec.rb
@@ -31,28 +31,28 @@
 
   describe PostsController::Show do
     it "should show post" do
-      get :id => @post
+      get :id => @post.id
       response.should be_success
     end
   end
 
   describe PostsController::Edit do
     it "should get edit" do
-      get :id => @post
+      get :id => @post.id
       response.should be_success
     end
   end
 
   describe PostsController::Update do
     it "should update post" do
-      put :id => @post, :post => @post.attributes
+      put :id => @post.id, :post => @post.attributes
       response.should redirect_to(post_path(subject.post))
     end
   end
 
   describe PostsController::Destroy do
     it "should destroy post" do
-      expect { delete :id => @post }.to change(Post, :count).by(-1)
+      expect { delete :id => @post.id }.to change(Post, :count).by(-1)
       response.should redirect_to(posts_path)
     end
   end

diff --git a/test/app/test/functional/posts_controller_test.rb b/test/app/test/functional/posts_controller_test.rb
@@ -36,29 +36,29 @@ class CreateTest < TestCase
 
   class ShowTest < TestCase
     test "should show post" do
-      get :id => @post
+      get :id => @post.id
       assert_response :success
     end
   end
 
   class EditTest < TestCase
     test "should get edit" do
-      get :id => @post
+      get :id => @post.id
       assert_response :success
     end
   end
 
   class UpdateTest < TestCase
     test "should update post" do
-      put :id => @post, :post => @post.attributes
+      put :id => @post.id, :post => @post.attributes
       assert_redirected_to post_path(@controller.post)
     end
   end
 
   class DestroyTest < TestCase
     test "should destroy post" do
       assert_difference('Post.count', -1) do
-        delete :id => @post
+        delete :id => @post.id
       end
 
       assert_redirected_to posts_path

diff --git a/test/helper.rb b/test/helper.rb
@@ -28,6 +28,6 @@ def self.root
   end
 
   def self.application
-    OpenStruct.new(:env_config => {})
+    OpenStruct.new(:env_config => {}, :env_defaults => {})
   end
 end