diff options
| author | twinturbo <me@broadcastingadam.com> | 2012-04-28 22:33:11 -0700 |
|---|---|---|
| committer | twinturbo <me@broadcastingadam.com> | 2012-04-28 22:33:11 -0700 |
| commit | d7532c189f26e008fc6ef50336ed5e8168b8221c (patch) | |
| tree | 681436aa5d80ed5e4c9a867ccc891eab6852f124 /guides/code/getting_started/test | |
| parent | 2c136ae0543ea53dcb3a3ef9372b216b54d66172 (diff) | |
| parent | 6659252d9f0e6d77bee268adf587e03cfeb8f9ad (diff) | |
| download | rails-d7532c189f26e008fc6ef50336ed5e8168b8221c.tar.gz rails-d7532c189f26e008fc6ef50336ed5e8168b8221c.tar.bz2 rails-d7532c189f26e008fc6ef50336ed5e8168b8221c.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'guides/code/getting_started/test')
| -rw-r--r-- | guides/code/getting_started/test/fixtures/posts.yml | 6 | ||||
| -rw-r--r-- | guides/code/getting_started/test/functional/home_controller_test.rb | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/guides/code/getting_started/test/fixtures/posts.yml b/guides/code/getting_started/test/fixtures/posts.yml index 8b0f75a33d..e1edfd385e 100644 --- a/guides/code/getting_started/test/fixtures/posts.yml +++ b/guides/code/getting_started/test/fixtures/posts.yml @@ -1,11 +1,9 @@ # Read about fixtures at http://api.rubyonrails.org/classes/Fixtures.html one: - name: MyString title: MyString - content: MyText + text: MyText two: - name: MyString title: MyString - content: MyText + text: MyText diff --git a/guides/code/getting_started/test/functional/home_controller_test.rb b/guides/code/getting_started/test/functional/home_controller_test.rb index 0d9bb47c3e..dff8e9d2c5 100644 --- a/guides/code/getting_started/test/functional/home_controller_test.rb +++ b/guides/code/getting_started/test/functional/home_controller_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class HomeControllerTest < ActionController::TestCase +class WelcomeControllerTest < ActionController::TestCase test "should get index" do get :index assert_response :success |