Merge remote-tracking branch 'origin/master'

4 files changed, 0 insertions, 65 deletions

diff --git a/railties/guides/code/getting_started/test/functional/.gitkeep b/railties/guides/code/getting_started/test/functional/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
--- a/railties/guides/code/getting_started/test/functional/.gitkeep
+++ /dev/null
diff --git a/railties/guides/code/getting_started/test/functional/comments_controller_test.rb b/railties/guides/code/getting_started/test/functional/comments_controller_test.rb
deleted file mode 100644
index 2ec71b4ec5..0000000000
--- a/railties/guides/code/getting_started/test/functional/comments_controller_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class CommentsControllerTest < ActionController::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end
diff --git a/railties/guides/code/getting_started/test/functional/home_controller_test.rb b/railties/guides/code/getting_started/test/functional/home_controller_test.rb
deleted file mode 100644
index 0d9bb47c3e..0000000000
--- a/railties/guides/code/getting_started/test/functional/home_controller_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'test_helper'
-
-class HomeControllerTest < ActionController::TestCase
-  test "should get index" do
-    get :index
-    assert_response :success
-  end
-
-end
diff --git a/railties/guides/code/getting_started/test/functional/posts_controller_test.rb b/railties/guides/code/getting_started/test/functional/posts_controller_test.rb
deleted file mode 100644
index b8f7b07820..0000000000
--- a/railties/guides/code/getting_started/test/functional/posts_controller_test.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-require 'test_helper'
-
-class PostsControllerTest < ActionController::TestCase
-  setup do
-    @post = posts(:one)
-  end
-
-  test "should get index" do
-    get :index
-    assert_response :success
-    assert_not_nil assigns(:posts)
-  end
-
-  test "should get new" do
-    get :new
-    assert_response :success
-  end
-
-  test "should create post" do
-    assert_difference('Post.count') do
-      post :create, post: @post.attributes
-    end
-
-    assert_redirected_to post_path(assigns(:post))
-  end
-
-  test "should show post" do
-    get :show, id: @post.to_param
-    assert_response :success
-  end
-
-  test "should get edit" do
-    get :edit, id: @post.to_param
-    assert_response :success
-  end
-
-  test "should update post" do
-    put :update, id: @post.to_param, post: @post.attributes
-    assert_redirected_to post_path(assigns(:post))
-  end
-
-  test "should destroy post" do
-    assert_difference('Post.count', -1) do
-      delete :destroy, id: @post.to_param
-    end
-
-    assert_redirected_to posts_path
-  end
-end