make dummy project compatiable with rails3.1 and 3.2

app/assets/javascripts/china_city/application.js.coffee

@@ -1,2 +1,3 @@
-#= require 'jquery'
+#= require jquery
+#= require china_city/jquery.china_city
 #= require_tree .

spec/dummy/config/application.rb

@@ -23,6 +23,13 @@ module Dummy
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
+
+    # Rails 3 config
+    # Enable the asset pipeline
+    config.assets.enabled = true
+
+    # Version of your assets, change this if you want to expire all your assets
+    config.assets.version = '1.0'
   end
 end
 

spec/dummy/config/initializers/secret_token.rb

@@ -10,3 +10,4 @@
 # Make sure your secret_key_base is kept private
 # if you're sharing your code publicly.
 Dummy::Application.config.secret_key_base = '9e1c4ade21b6a468450fcd39549c523c01f0c57c9332f1c23175cf2aa7e4afdd805c88fbdc16a16a4db50133a1b676064020c423e6d241d1db8966f093e481f0'
+Dummy::Application.config.secret_token = '968e37b544c846d0dd349dbac41cf973d19b603134e139be97b927d8a97037c94ed0da160635b17212a4024e5e70875dafac710642855fb93e62e1efe5161d85'

spec/dummy/script/rails

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require File.expand_path('../../config/boot',  __FILE__)
+require 'rails/commands'

spec/spec_helper.rb

@@ -10,9 +10,12 @@ require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require "rspec/rails"
 # require 'capybara/rails'
 require 'capybara/rspec'
+
 require 'capybara/poltergeist'
 Capybara.javascript_driver = :poltergeist
 
+puts "Rails: #{Rails.version}"
+
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true