diff options
author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-04-21 23:04:04 +0530 |
---|---|---|
committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-04-21 23:04:04 +0530 |
commit | a719843d31042690fa4fa8f55bc8a647d360b2a8 (patch) | |
tree | d7cf910019968511bd33a15ba2c3709a366f23cd /guides/code/getting_started/test | |
parent | ed8108300b2bb96f9f6888188f4fb8cd418ab950 (diff) | |
parent | c670b57f0f9ec4d992f89e62e513ff5b7baf58ac (diff) | |
download | rails-a719843d31042690fa4fa8f55bc8a647d360b2a8.tar.gz rails-a719843d31042690fa4fa8f55bc8a647d360b2a8.tar.bz2 rails-a719843d31042690fa4fa8f55bc8a647d360b2a8.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 |