Merge pull request #4 from khushkaran/fix/generator_deprecation_errors

Fix/generator deprecation errors
mattfreer · Jan 22, 2015 · 4bd09ad · 4bd09ad
2 parents c3b2817 + aaee6e6
commit 4bd09ad
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git a/active_model_form_objects.gemspec b/active_model_form_objects.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.add_dependency "rails", ">= 4.0.2"
 
   s.add_development_dependency "sqlite3"
-  s.add_development_dependency "rspec-rails", "~> 3.0.2"
+  s.add_development_dependency "rspec-rails", "~> 3.1"
   s.add_development_dependency "rspec-activemodel-mocks", "~> 1.0.1"
   s.add_development_dependency "database_cleaner"
   s.add_development_dependency "generator_spec"

diff --git a/spec/dummy/app/controllers/users_controller.rb b/spec/dummy/app/controllers/users_controller.rb
@@ -1,6 +1,4 @@
 class UsersController < ApplicationController
-  respond_to :html
-
   def signup
     @signup_form = UserSignup.new
   end
@@ -9,7 +7,7 @@ def create
     @signup_form = UserSignup.new(:params => params)
     if @signup_form.save
       @user = @signup_form.user
-      respond_with @user
+      render "create"
     else
       render "signup"
     end

diff --git a/spec/dummy/config/environments/test.rb b/spec/dummy/config/environments/test.rb
@@ -13,7 +13,7 @@
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
+  config.serve_static_files  = true
   config.static_cache_control = "public, max-age=3600"
 
   # Show full error reports and disable caching.

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -2,7 +2,6 @@
 ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../dummy/config/environment", __FILE__)
 require 'rspec/rails'
-require 'rspec/autorun'
 require 'rspec/active_model/mocks'
 require 'coveralls'