diff --git a/guides/assets/images/getting_started/rails_welcome.png b/guides/assets/images/getting_started/rails_welcome.png index 4d0cb417b7da5d8523358a45abd97778f97456a3..baccb113225d2718d934d939874bf94c545125b9 100644 Binary files a/guides/assets/images/getting_started/rails_welcome.png and b/guides/assets/images/getting_started/rails_welcome.png differ diff --git a/railties/lib/rails/templates/rails/welcome/index.html.erb b/railties/lib/rails/templates/rails/welcome/index.html.erb index acf04af416117e23a37d708dc66287012312ff46..5cdb7e6a2029ee8e708172dee10aece0d1fda04d 100644 --- a/railties/lib/rails/templates/rails/welcome/index.html.erb +++ b/railties/lib/rails/templates/rails/welcome/index.html.erb @@ -1,268 +1,64 @@ - - Ruby on Rails: Welcome aboard - - - - -
- - -
- - - - -
-

Getting started

-

Here’s how to get rolling:

- -
    -
  1. -

    Use bin/rails generate to create your models and controllers

    -

    To see all available options, run it without parameters.

    -
    2. - -
  2. -

    Set up a root route to replace this page

    -

    You're seeing this page because you're running in development mode and you haven't set a root route yet.

    -

    Routes are set up in config/routes.rb.

    -
    3. - -
  3. -

    Configure your database

    -

    If you're not using SQLite (the default), edit config/database.yml with your username and password.

    -
    4. -
-
-
- - -
- + + Ruby on Rails + + + + + + +
+
+

+ + Ruby on Rails + +

+ +

Yay! You’re on Rails!

+ + Welcome + +

+ Rails version: <%= Rails.version %>
+ Ruby version: <%= RUBY_VERSION %> (<%= RUBY_PLATFORM %>) +

+
+
+ diff --git a/railties/test/application/routing_test.rb b/railties/test/application/routing_test.rb index 0777714d3542b498eb462307e4476607b179f606..e51f32aaede3a50db0d72d1f0c8939645a7e46b5 100644 --- a/railties/test/application/routing_test.rb +++ b/railties/test/application/routing_test.rb @@ -42,8 +42,7 @@ def teardown test "root takes precedence over internal welcome controller" do app("development") - get '/' - assert_match %r{

Getting started

} , 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 df3c2ca66d467db135f0caa293deddbb9abced4c..dddf8bd257ba91ba732e734c7abb2680e2b5f518 100644 --- a/railties/test/isolation/abstract_unit.rb +++ b/railties/test/isolation/abstract_unit.rb @@ -74,10 +74,12 @@ def get(path) 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)