diff options
| author | Genadi Samokovarov <gsamokovarov@gmail.com> | 2016-01-25 18:26:20 +0200 |
|---|---|---|
| committer | Genadi Samokovarov <gsamokovarov@gmail.com> | 2016-01-26 00:27:49 +0200 |
| commit | 38492590cf30bae0f4817c610bc0237ccdea7c1a (patch) | |
| tree | 5052b1331d2bef18c49d4cdfcc28bcb31bcaa678 /railties/test | |
| parent | 6dfab475ca230dfcad7a603483431c8e7a8f908e (diff) | |
| download | rails-38492590cf30bae0f4817c610bc0237ccdea7c1a.tar.gz rails-38492590cf30bae0f4817c610bc0237ccdea7c1a.tar.bz2 rails-38492590cf30bae0f4817c610bc0237ccdea7c1a.zip | |
Introduce new welcome page for new projects
As requested by David in 23233.
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) |