Bring a few details in line with Rails 4.1

This commit is contained in:
Dan Rice 2014-06-19 12:33:38 -04:00
parent 9b92306252
commit d171e13e24
10 changed files with 13 additions and 14 deletions

View file

@ -3,4 +3,4 @@
require File.expand_path('../config/application', __FILE__)
Tracksapp::Application.load_tasks
Rails.application.load_tasks

View file

@ -4,7 +4,7 @@ require 'rails/all'
# Require the gems listed in Gemfile, including any gems
# you've limited to :test, :development, or :production.
Bundler.require(:default, Rails.env)
Bundler.require(*Rails.groups)
require 'yaml'
SITE_CONFIG = YAML.load_file(File.join(File.dirname(__FILE__), 'site.yml'))

View file

@ -1,4 +1,4 @@
# Set up gems listed in the Gemfile.
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])

View file

@ -1,5 +1,5 @@
# Load the rails application.
# Load the Rails application.
require File.expand_path('../application', __FILE__)
# Initialize the rails application.
Tracksapp::Application.initialize!
# Initialize the Rails application.
Rails.application.initialize!

View file

@ -1,5 +1,5 @@
Tracksapp::Application.configure do
# Settings specified here will take precedence over those in config/application.rb
Rails.application.configure do
# Settings specified here will take precedence over those in config/application.rb.
# In the development environment your application's code is reloaded on
# every request. This slows down response time but is perfect for development

View file

@ -1,4 +1,4 @@
Tracksapp::Application.configure do
Rails.application.configure do
# Settings specified here will take precedence over those in config/application.rb.
# Code is not reloaded between requests.

View file

@ -1,4 +1,4 @@
Tracksapp::Application.configure do
Rails.application.configure do
# Settings specified here will take precedence over those in config/application.rb.
# The test environment is used exclusively to run your application's

View file

@ -1,3 +1,3 @@
# Be sure to restart your server when you modify this file.
Tracksapp::Application.config.session_store :cookie_store, key: '_tracksapp_session'
Rails.application.config.session_store :cookie_store, key: '_tracksapp_session'

View file

@ -1,4 +1,4 @@
Tracksapp::Application.routes.draw do
Rails.application.routes.draw do
mount Tolk::Engine => '/tolk', :as => 'tolk' if Rails.env=='development'
root :to => 'todos#index'

View file

@ -1,5 +1,4 @@
ENV["RAILS_ENV"] ||= "test"
require File.expand_path('../../config/environment', __FILE__)
require 'rails/test_help'
@ -8,7 +7,7 @@ require 'rails/test_help'
class ActiveSupport::TestCase
ActiveRecord::Migration.check_pending!
# Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
# Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
#
# Note: You'll currently still have to declare fixtures explicitly in integration tests
# -- they do not yet inherit this setting