From 04591aed9f134e65bd31a43dcfa1864fd7dea278 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Thu, 8 Sep 2016 10:01:11 +0100 Subject: [PATCH 1/6] Test DiaryComment body validation Replaces unnecessary test. --- test/models/diary_comment_test.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/models/diary_comment_test.rb b/test/models/diary_comment_test.rb index 908c79bfa6..aa03dc66c4 100644 --- a/test/models/diary_comment_test.rb +++ b/test/models/diary_comment_test.rb @@ -1,8 +1,9 @@ require "test_helper" class DiaryCommentTest < ActiveSupport::TestCase - def test_diary_comment_exists - comment = create(:diary_comment) - assert_includes DiaryComment.all, comment + test "body must be present" do + comment = build(:diary_comment, :body => "") + assert_not comment.valid? + assert_not_nil comment.errors[:body], "no validation error for missing body" end end From 4f5c8b79565298d483256746797320b0fc2b00aa Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Thu, 8 Sep 2016 11:40:03 +0100 Subject: [PATCH 2/6] Change the display_name of suspended user fixuture The original name is reserved, which means the user was invalid, and this causes problems when building objects using it via associations. --- test/fixtures/users.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index 10633e05d2..bee5aa282f 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -136,7 +136,7 @@ suspended_user: status: suspended pass_crypt: <%= Digest::MD5.hexdigest('test') %> creation_time: "2007-01-01 00:00:00" - display_name: suspended + display_name: suspended user data_public: true description: test terms_agreed: "2010-01-01 11:22:33" From ea610c8c3c006555cac91b8c238c82938f33aef7 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Thu, 8 Sep 2016 11:44:24 +0100 Subject: [PATCH 3/6] Refactor tests to use factories instead of fixtures --- .../diary_entry_controller_test.rb | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/test/controllers/diary_entry_controller_test.rb b/test/controllers/diary_entry_controller_test.rb index 60c981efb5..d8e3f29463 100644 --- a/test/controllers/diary_entry_controller_test.rb +++ b/test/controllers/diary_entry_controller_test.rb @@ -519,34 +519,41 @@ def test_view def test_view_hidden_comments # Get a diary entry that has hidden comments - get :view, :display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_geo_entry).id + diary_entry = create(:diary_entry) + visible_comment = create(:diary_comment, :diary_entry => diary_entry) + suspended_user_comment = create(:diary_comment, :diary_entry => diary_entry, :user_id => users(:suspended_user).id) + deleted_user_comment = create(:diary_comment, :diary_entry => diary_entry, :user_id => users(:deleted_user).id) + hidden_comment = create(:diary_comment, :diary_entry => diary_entry, :visible => false) + + get :view, :display_name => users(:normal_user).display_name, :id => diary_entry.id assert_response :success assert_template :view assert_select "div.comments" do - assert_select "p#comment1", :count => 1 # visible comment - assert_select "p#comment2", :count => 0 # comment by suspended user - assert_select "p#comment3", :count => 0 # comment by deleted user - assert_select "p#comment4", :count => 0 # hidden comment + assert_select "p#comment#{visible_comment.id}", :count => 1 + assert_select "p#comment#{suspended_user_comment.id}", :count => 0 + assert_select "p#comment#{deleted_user_comment.id}", :count => 0 + assert_select "p#comment#{hidden_comment.id}", :count => 0 end end def test_hide # Try without logging in - post :hide, :display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_entry_1).id + diary_entry = create(:diary_entry) + post :hide, :display_name => users(:normal_user).display_name, :id => diary_entry.id assert_response :forbidden - assert_equal true, DiaryEntry.find(diary_entries(:normal_user_entry_1).id).visible + assert_equal true, DiaryEntry.find(diary_entry.id).visible # Now try as a normal user - post :hide, { :display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_entry_1).id }, { :user => users(:normal_user).id } + post :hide, { :display_name => users(:normal_user).display_name, :id => diary_entry.id }, { :user => users(:normal_user).id } assert_response :redirect - assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_entry_1).id - assert_equal true, DiaryEntry.find(diary_entries(:normal_user_entry_1).id).visible + assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name, :id => diary_entry.id + assert_equal true, DiaryEntry.find(diary_entry.id).visible # Finally try as an administrator - post :hide, { :display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_entry_1).id }, { :user => users(:administrator_user).id } + post :hide, { :display_name => users(:normal_user).display_name, :id => diary_entry.id }, { :user => users(:administrator_user).id } assert_response :redirect assert_redirected_to :action => :list, :display_name => users(:normal_user).display_name - assert_equal false, DiaryEntry.find(diary_entries(:normal_user_entry_1).id).visible + assert_equal false, DiaryEntry.find(diary_entry.id).visible end def test_hidecomment From f1713320c2e43f0f2011cd86fd16e88d18994e07 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 14 Sep 2016 12:41:58 +0100 Subject: [PATCH 4/6] Remove diary_entry and diary_comment fixtures, and refactor tests. Note that you might need to empty the tables in your local test database, since the removed fixtures may still linger there. --- .../diary_entry_controller_test.rb | 86 +++++++++++++------ test/fixtures/diary_comments.yml | 35 -------- test/fixtures/diary_entries.yml | 71 --------------- 3 files changed, 61 insertions(+), 131 deletions(-) delete mode 100644 test/fixtures/diary_comments.yml delete mode 100644 test/fixtures/diary_entries.yml diff --git a/test/controllers/diary_entry_controller_test.rb b/test/controllers/diary_entry_controller_test.rb index d8e3f29463..7a92e52898 100644 --- a/test/controllers/diary_entry_controller_test.rb +++ b/test/controllers/diary_entry_controller_test.rb @@ -1,7 +1,7 @@ require "test_helper" class DiaryEntryControllerTest < ActionController::TestCase - fixtures :users, :user_roles, :diary_entries, :diary_comments, :languages, :friends + fixtures :users, :user_roles, :languages, :friends include ActionView::Helpers::NumberHelper @@ -199,7 +199,7 @@ def test_new_spammy end def test_edit - entry = diary_entries(:normal_user_entry_1) + entry = create(:diary_entry, :user_id => users(:normal_user).id) # Make sure that you are redirected to the login page when you are # not logged in, without and with the id of the entry you want to edit @@ -296,13 +296,14 @@ def test_edit end def test_edit_i18n - get :edit, { :display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_entry_1).id }, { :user => users(:normal_user).id } + diary_entry = create(:diary_entry, :language_code => "en") + get :edit, { :display_name => users(:normal_user).display_name, :id => diary_entry.id }, { :user => users(:normal_user).id } assert_response :success assert_select "span[class=translation_missing]", false, "Missing translation in edit diary entry" end def test_comment - entry = diary_entries(:normal_user_entry_1) + entry = create(:diary_entry, :user_id => users(:normal_user).id) # Make sure that you are denied when you are not logged in post :comment, :display_name => entry.user.display_name, :id => entry.id @@ -356,7 +357,7 @@ def test_comment def test_comment_spammy # Find the entry to comment on - entry = diary_entries(:normal_user_entry_1) + entry = create(:diary_entry, :user_id => users(:normal_user).id) # Generate some spammy content spammy_text = 1.upto(50).map { |n| "http://example.com/spam#{n}" }.join(" ") @@ -393,15 +394,22 @@ def test_comment_spammy end def test_list_all + diary_entry = create(:diary_entry) + geo_entry = create(:diary_entry, :latitude => 51.50763, :longitude => -0.10781) + public_entry = create(:diary_entry, :user_id => users(:public_user).id) + # Try a list of all diary entries get :list - check_diary_list :normal_user_entry_1, :normal_user_geo_entry, :public_user_entry_1 + check_diary_list diary_entry, geo_entry, public_entry end def test_list_user + diary_entry = create(:diary_entry) + geo_entry = create(:diary_entry, :latitude => 51.50763, :longitude => -0.10781) + # Try a list of diary entries for a valid user get :list, :display_name => users(:normal_user).display_name - check_diary_list :normal_user_entry_1, :normal_user_geo_entry + check_diary_list diary_entry, geo_entry # Try a list of diary entries for an invalid user get :list, :display_name => "No Such User" @@ -410,6 +418,8 @@ def test_list_user end def test_list_friends + diary_entry = create(:diary_entry, :user_id => friends(:normal_user_with_second_user).friend_user_id) + # Try a list of diary entries for your friends when not logged in get :list, :friends => true assert_response :redirect @@ -417,12 +427,13 @@ def test_list_friends # Try a list of diary entries for your friends when logged in get :list, { :friends => true }, { :user => users(:normal_user).id } - check_diary_list :public_user_entry_1 + check_diary_list diary_entry get :list, { :friends => true }, { :user => users(:public_user).id } check_diary_list end def test_list_nearby + diary_entry = create(:diary_entry, :user_id => users(:public_user).id) # Try a list of diary entries for nearby users when not logged in get :list, :nearby => true assert_response :redirect @@ -430,19 +441,23 @@ def test_list_nearby # Try a list of diary entries for nearby users when logged in get :list, { :nearby => true }, { :user => users(:german_user).id } - check_diary_list :public_user_entry_1 + check_diary_list diary_entry get :list, { :nearby => true }, { :user => users(:public_user).id } check_diary_list end def test_list_language + diary_entry_en = create(:diary_entry, :language_code => "en") + diary_entry_en2 = create(:diary_entry, :language_code => "en") + diary_entry_de = create(:diary_entry, :language_code => "de") + # Try a list of diary entries in english get :list, :language => "en" - check_diary_list :normal_user_entry_1, :public_user_entry_1 + check_diary_list diary_entry_en, diary_entry_en2 # Try a list of diary entries in german get :list, :language => "de" - check_diary_list :normal_user_geo_entry + check_diary_list diary_entry_de # Try a list of diary entries in slovenian get :list, :language => "sl" @@ -450,6 +465,10 @@ def test_list_language end def test_rss + create(:diary_entry, :language_code => "en") + create(:diary_entry, :language_code => "en") + create(:diary_entry, :language_code => "de") + get :rss, :format => :rss assert_response :success, "Should be able to get a diary RSS" assert_select "rss", :count => 1 do @@ -462,7 +481,11 @@ def test_rss end def test_rss_language - get :rss, :language => diary_entries(:normal_user_entry_1).language_code, :format => :rss + create(:diary_entry, :language_code => "en") + create(:diary_entry, :language_code => "en") + create(:diary_entry, :language_code => "de") + + get :rss, :language => "en", :format => :rss assert_response :success, "Should be able to get a specific language diary RSS" assert_select "rss>channel>item", :count => 2 # , "Diary entries should be filtered by language" end @@ -473,12 +496,18 @@ def test_rss_language # end def test_rss_language_with_no_entries + create(:diary_entry, :language_code => "en") + get :rss, :language => "sl", :format => :rss assert_response :success, "Should be able to get a specific language diary RSS" assert_select "rss>channel>item", :count => 0 # , "Diary entries should be filtered by language" end def test_rss_user + create(:diary_entry, :user_id => users(:normal_user).id) + create(:diary_entry, :user_id => users(:normal_user).id) + create(:diary_entry, :user_id => users(:public_user).id) + get :rss, :display_name => users(:normal_user).display_name, :format => :rss assert_response :success, "Should be able to get a specific users diary RSS" assert_select "rss>channel>item", :count => 2 # , "Diary entries should be filtered by user" @@ -500,20 +529,24 @@ def test_rss_nonexisting_user def test_view # Try a normal entry that should work - get :view, :display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_entry_1).id + diary_entry = create(:diary_entry, :user_id => users(:normal_user).id) + get :view, :display_name => users(:normal_user).display_name, :id => diary_entry.id assert_response :success assert_template :view # Try a deleted entry - get :view, :display_name => users(:normal_user).display_name, :id => diary_entries(:deleted_entry).id + diary_entry_deleted = create(:diary_entry, :user_id => users(:normal_user).id, :visible => false) + get :view, :display_name => users(:normal_user).display_name, :id => diary_entry_deleted.id assert_response :not_found # Try an entry by a suspended user - get :view, :display_name => users(:suspended_user).display_name, :id => diary_entries(:entry_by_suspended_user).id + diary_entry_suspended = create(:diary_entry, :user_id => users(:suspended_user).id) + get :view, :display_name => users(:suspended_user).display_name, :id => diary_entry_suspended.id assert_response :not_found # Try an entry by a deleted user - get :view, :display_name => users(:deleted_user).display_name, :id => diary_entries(:entry_by_deleted_user).id + diary_entry_deleted = create(:diary_entry, :user_id => users(:deleted_user).id) + get :view, :display_name => users(:deleted_user).display_name, :id => diary_entry_deleted.id assert_response :not_found end @@ -557,22 +590,24 @@ def test_hide end def test_hidecomment + diary_entry = create(:diary_entry, :user_id => users(:normal_user).id) + diary_comment = create(:diary_comment, :diary_entry => diary_entry) # Try without logging in - post :hidecomment, :display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_geo_entry).id, :comment => diary_comments(:comment_for_geo_post).id + post :hidecomment, :display_name => users(:normal_user).display_name, :id => diary_entry.id, :comment => diary_comment.id assert_response :forbidden - assert_equal true, DiaryComment.find(diary_comments(:comment_for_geo_post).id).visible + assert_equal true, DiaryComment.find(diary_comment.id).visible # Now try as a normal user - post :hidecomment, { :display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_geo_entry).id, :comment => diary_comments(:comment_for_geo_post).id }, { :user => users(:normal_user).id } + post :hidecomment, { :display_name => users(:normal_user).display_name, :id => diary_entry.id, :comment => diary_comment.id }, { :user => users(:normal_user).id } assert_response :redirect - assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_geo_entry).id - assert_equal true, DiaryComment.find(diary_comments(:comment_for_geo_post).id).visible + assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name, :id => diary_entry.id + assert_equal true, DiaryComment.find(diary_comment.id).visible # Finally try as an administrator - post :hidecomment, { :display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_geo_entry).id, :comment => diary_comments(:comment_for_geo_post).id }, { :user => users(:administrator_user).id } + post :hidecomment, { :display_name => users(:normal_user).display_name, :id => diary_entry.id, :comment => diary_comment.id }, { :user => users(:administrator_user).id } assert_response :redirect - assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_geo_entry).id - assert_equal false, DiaryComment.find(diary_comments(:comment_for_geo_post).id).visible + assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name, :id => diary_entry.id + assert_equal false, DiaryComment.find(diary_comment.id).visible end def test_comments @@ -585,6 +620,8 @@ def test_comments end # Test a user with a comment + create(:diary_comment, :user_id => users(:public_user).id) + get :comments, :display_name => users(:public_user).display_name assert_response :success assert_template :comments @@ -610,7 +647,6 @@ def check_diary_list(*entries) assert_select "div.diary_post", entries.count entries.each do |entry| - entry = diary_entries(entry) assert_select "a[href=?]", "/user/#{entry.user.display_name}/diary/#{entry.id}" end end diff --git a/test/fixtures/diary_comments.yml b/test/fixtures/diary_comments.yml deleted file mode 100644 index 247fc3abd4..0000000000 --- a/test/fixtures/diary_comments.yml +++ /dev/null @@ -1,35 +0,0 @@ -comment_for_geo_post: - id: 1 - diary_entry_id: 2 - user_id: 2 - body: Some comment text - created_at: "2008-11-08 09:45:34" - updated_at: "2008-11-08 10:34:34" - visible: true - -comment_by_suspended_user: - id: 2 - diary_entry_id: 2 - user_id: 10 - body: Some comment text - created_at: "2008-11-08 09:45:34" - updated_at: "2008-11-08 10:34:34" - visible: true - -comment_by_deleted_user: - id: 3 - diary_entry_id: 2 - user_id: 11 - body: Some comment text - created_at: "2008-11-08 09:45:34" - updated_at: "2008-11-08 10:34:34" - visible: true - -hidden_comment: - id: 4 - diary_entry_id: 2 - user_id: 2 - body: Some comment text - created_at: "2008-11-08 09:45:34" - updated_at: "2008-11-08 10:34:34" - visible: false diff --git a/test/fixtures/diary_entries.yml b/test/fixtures/diary_entries.yml deleted file mode 100644 index 6c5c1927db..0000000000 --- a/test/fixtures/diary_entries.yml +++ /dev/null @@ -1,71 +0,0 @@ -normal_user_entry_1: - id: 1 - user_id: 1 - title: Diary Entry 1 - body: This is the body of diary entry 1. - created_at: "2008-11-07 17:43:34" - updated_at: "2008-11-07 17:43:34" - latitude: - longitude: - language_code: en - visible: true - -normal_user_geo_entry: - id: 2 - user_id: 1 - title: Geo Entry 1 - body: This is the body of a geo diary entry in London. - created_at: "2008-11-07 17:47:34" - updated_at: "2008-11-07 17:47:34" - latitude: 51.50763 - longitude: -0.10781 - language_code: de - visible: true - -deleted_entry: - id: 3 - user_id: 1 - title: Deleted Entry 1 - body: This is the body of a deleted diary entry. - created_at: "2008-11-07 17:43:34" - updated_at: "2008-11-07 17:43:34" - latitude: - longitude: - language_code: en - visible: false - -entry_by_suspended_user: - id: 4 - user_id: 10 - title: Entry by suspended user - body: This is the body of a diary entry by a suspended user. - created_at: "2008-11-07 17:43:34" - updated_at: "2008-11-07 17:43:34" - latitude: - longitude: - language_code: en - visible: true - -entry_by_deleted_user: - id: 5 - user_id: 11 - title: Entry by deleted user - body: This is the body of a diary entry by a deleted user. - created_at: "2008-11-07 17:43:34" - updated_at: "2008-11-07 17:43:34" - latitude: - longitude: - language_code: en - visible: true - -public_user_entry_1: - id: 6 - user_id: 2 - title: Public User Diary Entry 1 - body: This is the body of diary entry 1. - created_at: "2008-11-07 17:43:34" - updated_at: "2008-11-07 17:43:34" - latitude: - longitude: - language_code: en - visible: true From d26f4074faf4fcc5ebb1b6a0928edf3aae9c2aee Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 14 Sep 2016 16:23:47 +0100 Subject: [PATCH 5/6] Remove unneccessary fixture requirement. --- test/integration/user_diaries_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/user_diaries_test.rb b/test/integration/user_diaries_test.rb index a0b084f923..55e3bce017 100644 --- a/test/integration/user_diaries_test.rb +++ b/test/integration/user_diaries_test.rb @@ -1,7 +1,7 @@ require "test_helper" class UserDiariesTest < ActionDispatch::IntegrationTest - fixtures :users, :diary_entries + fixtures :users # Test the creation of a diary entry, making sure that you are redirected to # login page when not logged in From 516979b045f398b0c8ebb4f1cd3aaf57e8eca7a7 Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Thu, 15 Sep 2016 11:06:37 +0100 Subject: [PATCH 6/6] Add additional list items to ensure they are not selected The other list tests already have assetions showing the different lengths of lists. --- test/controllers/diary_entry_controller_test.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/test/controllers/diary_entry_controller_test.rb b/test/controllers/diary_entry_controller_test.rb index 7a92e52898..6e07a40910 100644 --- a/test/controllers/diary_entry_controller_test.rb +++ b/test/controllers/diary_entry_controller_test.rb @@ -404,8 +404,9 @@ def test_list_all end def test_list_user - diary_entry = create(:diary_entry) - geo_entry = create(:diary_entry, :latitude => 51.50763, :longitude => -0.10781) + diary_entry = create(:diary_entry, :user_id => users(:normal_user).id) + geo_entry = create(:diary_entry, :user_id => users(:normal_user).id, :latitude => 51.50763, :longitude => -0.10781) + _other_entry = create(:diary_entry, :user_id => users(:public_user).id) # Try a list of diary entries for a valid user get :list, :display_name => users(:normal_user).display_name @@ -419,6 +420,7 @@ def test_list_user def test_list_friends diary_entry = create(:diary_entry, :user_id => friends(:normal_user_with_second_user).friend_user_id) + _other_entry = create(:diary_entry, :user_id => users(:second_public_user).id) # Try a list of diary entries for your friends when not logged in get :list, :friends => true @@ -434,6 +436,7 @@ def test_list_friends def test_list_nearby diary_entry = create(:diary_entry, :user_id => users(:public_user).id) + # Try a list of diary entries for nearby users when not logged in get :list, :nearby => true assert_response :redirect