diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2016-01-28 14:33:23 +0100 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2016-01-28 14:33:23 +0100 |
commit | f3c1897d30f89b45df51da4e61eeda19a7e3c849 (patch) | |
tree | 323c704ea6e78e203bbe3ca97db579cd55347038 /railties/test | |
parent | ac0446870f0504958ada7431681e37fffba6391a (diff) | |
parent | 38492590cf30bae0f4817c610bc0237ccdea7c1a (diff) | |
download | rails-f3c1897d30f89b45df51da4e61eeda19a7e3c849.tar.gz rails-f3c1897d30f89b45df51da4e61eeda19a7e3c849.tar.bz2 rails-f3c1897d30f89b45df51da4e61eeda19a7e3c849.zip |
Merge pull request #23237 from gsamokovarov/new-welcome-page
Introduce new welcome page for new projects
Diffstat (limited to 'railties/test')
-rw-r--r-- | railties/test/application/routing_test.rb | 3 | ||||
-rw-r--r-- | railties/test/isolation/abstract_unit.rb | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/railties/test/application/routing_test.rb b/railties/test/application/routing_test.rb index 0777714d35..e51f32aaed 100644 --- a/railties/test/application/routing_test.rb +++ b/railties/test/application/routing_test.rb @@ -42,8 +42,7 @@ module ApplicationTests test "root takes precedence over internal welcome controller" do app("development") - get '/' - assert_match %r{<h1>Getting started</h1>} , last_response.body + assert_welcome get('/') controller :foo, <<-RUBY class FooController < ApplicationController diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb index df3c2ca66d..dddf8bd257 100644 --- a/railties/test/isolation/abstract_unit.rb +++ b/railties/test/isolation/abstract_unit.rb @@ -74,10 +74,12 @@ module TestHelpers end def assert_welcome(resp) + resp = Array(resp) + assert_equal 200, resp[0] assert_match 'text/html', resp[1]["Content-Type"] assert_match 'charset=utf-8', resp[1]["Content-Type"] - assert extract_body(resp).match(/Welcome aboard/) + assert extract_body(resp).match(/Yay! You.*re on Rails!/) end def assert_success(resp) |