From d85f73a30d48b3472346fb712106e6d5f4403278 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 17 Jan 2015 17:02:55 +0000 Subject: Upgrade to Rails 4.2.0 (#14534). git-svn-id: http://svn.redmine.org/redmine/trunk@13892 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/tasks/initializers.rake | 2 +- lib/tasks/testing.rake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/tasks') diff --git a/lib/tasks/initializers.rake b/lib/tasks/initializers.rake index c1fdc7bf5..6da60c147 100644 --- a/lib/tasks/initializers.rake +++ b/lib/tasks/initializers.rake @@ -15,7 +15,7 @@ file 'config/initializers/secret_token.rb' do # change this key, all old sessions will become invalid! Make sure the # secret is at least 30 characters and all random, no regular words or # you'll be exposed to dictionary attacks. -RedmineApp::Application.config.secret_token = '#{secret}' +RedmineApp::Application.config.secret_key_base = '#{secret}' EOF end end diff --git a/lib/tasks/testing.rake b/lib/tasks/testing.rake index e267d0820..f87ffc1fd 100644 --- a/lib/tasks/testing.rake +++ b/lib/tasks/testing.rake @@ -104,7 +104,7 @@ namespace :test do Rake::TestTask.new(:ui => "db:test:prepare") do |t| t.libs << "test" t.verbose = true - t.test_files = FileList['test/ui/**/*_test.rb'] + t.test_files = FileList['test/ui/**/*_test_ui.rb'] end Rake::Task['test:ui'].comment = "Run the UI tests with Capybara (PhantomJS listening on port 4444 is required)" end -- cgit v1.2.3