diff --git a/test/fixtures/node_tags.yml b/test/fixtures/node_tags.yml
index 80cc84d455..bc9f392d2b 100644
--- a/test/fixtures/node_tags.yml
+++ b/test/fixtures/node_tags.yml
@@ -263,7 +263,7 @@ organizers-chapter:
# this tags node 37 as a question
# ultimately, this is for testing comments on that node.
-question4:
+comment_question:
tid: 35
uid: 2
nid: 37
diff --git a/test/fixtures/nodes.yml b/test/fixtures/nodes.yml
index 9ce01633ee..5f9ddec71e 100644
--- a/test/fixtures/nodes.yml
+++ b/test/fixtures/nodes.yml
@@ -446,7 +446,7 @@ sun_question:
cached_likes: 0
slug: "note-tagged-with-question-sun"
-question4: # for testing comments on questions
+comment_question: # for testing comments on questions
nid: 37
uid: 2
title: "Can I post comments here"
diff --git a/test/fixtures/revisions.yml b/test/fixtures/revisions.yml
index 4653169cc0..b48daba546 100644
--- a/test/fixtures/revisions.yml
+++ b/test/fixtures/revisions.yml
@@ -403,7 +403,7 @@ sun_question:
timestamp: <%= DateTime.new(2020,2,12).to_i %>
status: 1
-question4: # for testing comments on questions
+comment_question: # for testing comments on questions
nid: 37
uid: 2
title: "Can I post comments here"
diff --git a/test/fixtures/tags.yml b/test/fixtures/tags.yml
index ef0bb2523e..e6913ce3fc 100644
--- a/test/fixtures/tags.yml
+++ b/test/fixtures/tags.yml
@@ -139,7 +139,7 @@ sun_question:
# this tags node 37 as a question
# ultimately, this is for testing comments on that node.
-question4:
+comment_question:
tid: 35
name: question:general
diff --git a/test/system/comment_test.rb b/test/system/comment_test.rb
index d7a95be12f..80dbc53128 100644
--- a/test/system/comment_test.rb
+++ b/test/system/comment_test.rb
@@ -15,340 +15,246 @@ def setup
find(".login-modal-form #login-button").click()
end
- test 'wiki: comment via JavaScript, with comment body ONLY' do
- visit "/wiki/wiki-page-path/comments"
-
- # run the javascript function
- page.evaluate_script("addComment('fantastic four')")
-
- # check that the tag showed up on the page
- assert_selector('#comments-list .comment-body p', text: 'fantastic four')
- end
-
- test 'wiki: comment via JavaScript, with comment body + URL' do
- visit "/wiki/wiki-page-path/comments"
-
- # run the javascript function
- page.evaluate_script("addComment('superhero', '/comment/create/11')")
-
- # check that the tag showed up on the page
- assert_selector('#comments-list .comment-body p', text: 'superhero')
- end
-
- test 'wiki: reply to comment via JavaScript with comment body + URL' do
- visit "/wiki/wiki-page-path/comments"
-
- # run the javascript function
- parentid = "#" + page.find('#comments-list').first('.comment')[:id]
- parentid_num = parentid.slice(2..-1)
- page.evaluate_script("addComment('batman', '/comment/create/11', #{parentid_num})")
-
- # check that the tag showed up on the page
- assert_selector("#{parentid} .comment .comment-body p", text: 'batman')
- end
-
- test 'note: comment via JavaScript, with comment body + URL' do
- visit nodes(:comment_note).path
- page.evaluate_script("addComment('hahaha', '/comment/create/38')")
- assert_selector('#comments-list .comment-body p', text: 'hahaha')
- end
-
- test 'note: respond to existing comment' do
- visit nodes(:comment_note).path
- # find comment ID of the first comment on page
- parent_id = "#" + page.find('#comments-list').first('.comment')[:id]
- # comment ID format is id="c9834"
- # regex to find everything after the "c"
- parent_id_num = /c(\d+)/.match(parent_id)[1]
- # parameters for addComment: addComment(comment text, submitURL, comment's parent ID)
- page.evaluate_script("addComment(\"I admire you\", '/comment/create/#{nodes(:comment_note).nid}', #{parent_id_num})")
- # check for comment text
- assert_selector("#{parent_id} .comment .comment-body p", text: 'I admire you')
- end
-
- test "note: comment manually" do
- visit nodes(:one).path
-
- fill_in("body", with: "Awesome comment! :)")
-
- # preview comment
- find("#post_comment").click
- find("p", text: "Awesome comment! :)")
-
- # publish comment
- click_on "Publish"
- find(".noty_body", text: "Comment Added!")
- find("p", text: "Awesome comment! :)")
-
- # replying to the comment
- first("p", text: "Reply to this comment...").click()
-
- fill_in("body", with: "Awesome Reply")
-
- # preview reply
- first("#post_comment").click
- find("p", text: "Awesome Reply")
- end
-
- test 'question page: add synchronous comment via javascript with URL only' do
- visit "/questions/jeff/12-07-2020/can-i-post-comments-here"
- page.evaluate_script("addComment('yes you can', '/comment/create/37')")
- assert_selector('#comments-list .comment-body p', text: 'yes you can')
- end
-
- test 'question page: respond to existing comment' do
- visit "/questions/jeff/12-07-2020/can-i-post-comments-here"
-
- # find comment ID of the first comment on page
- parent_id = "#" + page.find('#comments-list').first('.comment')[:id]
- parent_id_num = /c(\d+)/.match(parent_id)[1] # eg. comment ID format is id="c9834"
-
- # addComment(comment text, submitURL, comment's parent ID)
- page.evaluate_script("addComment(\"no you can't\", '/comment/create/37', #{parent_id_num})")
-
- # check for comment text
- assert_selector("#{parent_id} .comment .comment-body p", text: 'no you can\'t')
- end
-
- test 'question page: reply to freshly posted comment' do
- visit nodes(:question4).path
- # post new comment
+ # page_types are wiki, research note, question:
+ page_types.each do |page_type, node_name|
+ page_type_string = page_type.to_s
comment_text = 'woot woot'
- page.evaluate_script("addComment('#{comment_text}', '/comment/create/#{nodes(:question4).nid}')")
- # we need the ID of parent div that contains
has child div[div[p[text="wooly woot!"]]]
- assert_selector("#{'#c' + parent_id_num + 'show'} div div div p", text: comment_response_text)
- end
-
- test 'comment preview button' do
- visit "/wiki/wiki-page-path/comments"
-
- find("p", text: "Reply to this comment...").click()
-
- reply_preview_button = page.all('#post_comment')[0]
- comment_preview_button = page.all('#post_comment')[1]
-
- # Toggle preview
- reply_preview_button.click()
-
- # Make sure that buttons are not binded with each other
- assert_equal( reply_preview_button.text, "Hide Preview" )
- assert_equal( comment_preview_button.text, "Preview" )
- end
-
- test 'comment image upload' do
- Capybara.ignore_hidden_elements = false
- visit "/wiki/wiki-page-path/comments"
-
- find("p", text: "Reply to this comment...").click()
-
- reply_preview_button = page.all('#post_comment')[0]
- fileinput_element = page.all('#fileinput')[0]
-
- # Upload the image
- fileinput_element.set("#{Rails.root.to_s}/public/images/pl.png")
-
- # Wait for image upload to finish
- wait_for_ajax
- Capybara.ignore_hidden_elements = true
-
- # Toggle preview
- reply_preview_button.click()
-
- # Make sure that image has been uploaded
- page.assert_selector('#preview img', count: 1)
- end
-
- test 'comment image upload by choose one' do
- Capybara.ignore_hidden_elements = false
- visit "/wiki/wiki-page-path/comments"
-
- find("p", text: "Reply to this comment...").click()
- first("a", text: "choose one").click()
-
- reply_preview_button = page.all('#post_comment')[0]
- fileinput_element = page.all('#fileinput')[0]
-
- # Upload the image
- fileinput_element.set("#{Rails.root.to_s}/public/images/pl.png")
-
- # Wait for image upload to finish
- wait_for_ajax
- Capybara.ignore_hidden_elements = true
-
- # Toggle preview
- reply_preview_button.click()
-
- # Make sure that image has been uploaded
- page.assert_selector('#preview img', count: 1)
- end
- test 'comment image drag and drop upload' do
- Capybara.ignore_hidden_elements = false
- visit "/wiki/wiki-page-path/comments"
-
- find("p", text: "Reply to this comment...").click()
-
- reply_preview_button = page.all('#post_comment')[0]
-
- # Upload the image
- drop_in_dropzone("#{Rails.root.to_s}/public/images/pl.png", ".dropzone")
-
- # Wait for image upload to finish
- wait_for_ajax
- Capybara.ignore_hidden_elements = true
-
- # Toggle preview
- reply_preview_button.click()
-
- # Make sure that image has been uploaded
- page.assert_selector('#preview img', count: 1)
- end
-
- test 'ctrl/cmd + enter comment publishing keyboard shortcut' do
- visit "/wiki/wiki-page-path/comments"
-
- find("p", text: "Reply to this comment...").click()
-
- # Write a comment
- page.all("#text-input")[1].set("Great post!")
-
- page.execute_script <<-JS
- // Remove first text-input field
- $("#text-input").remove()
-
- var $textBox = $("#text-input");
-
- // Generate fake CTRL + Enter event
- var press = jQuery.Event("keypress");
- press.altGraphKey = false;
- press.altKey = false;
- press.bubbles = true;
- press.cancelBubble = false;
- press.cancelable = true;
- press.charCode = 10;
- press.clipboardData = undefined;
- press.ctrlKey = true;
- press.currentTarget = $textBox[0];
- press.defaultPrevented = false;
- press.detail = 0;
- press.eventPhase = 2;
- press.keyCode = 10;
- press.keyIdentifier = "";
- press.keyLocation = 0;
- press.layerX = 0;
- press.layerY = 0;
- press.metaKey = false;
- press.pageX = 0;
- press.pageY = 0;
- press.returnValue = true;
- press.shiftKey = false;
- press.srcElement = $textBox[0];
- press.target = $textBox[0];
- press.type = "keypress";
- press.view = Window;
- press.which = 10;
-
- // Emit fake CTRL + Enter event
- $textBox.trigger(press);
- JS
-
- assert_selector('#comments-list .comment', count: 2)
- assert_selector('.noty_body', text: 'Comment Added!')
- end
-
- test 'comment deletion' do
- visit "/wiki/wiki-page-path/comments"
-
- # Create a comment
- page.execute_script <<-JS
- var commentForm = $('.comment-form-wrapper')[1];
- var submitCommentBtn = $(commentForm).find('.btn-primary')[0];
- var commentTextarea = $(commentForm).find('#text-input')[0]
-
- $(commentTextarea).val('Great post Jeff!')
- $(submitCommentBtn).click()
- JS
-
- # Delete a comment
- find('.btn[data-original-title="Delete comment"]', match: :first).click()
-
- # Click "confirm" on modal
- page.evaluate_script('document.querySelector(".jconfirm-buttons .btn:first-of-type").click()')
-
- assert_selector('#comments-list .comment', count: 1)
- assert_selector('.noty_body', text: 'Comment deleted')
- end
-
- test 'formattting toolbar are rendered' do
- visit "/wiki/wiki-page-path/comments"
-
- assert_selector('.btn[data-original-title="Bold"]', count: 1)
- assert_selector('.btn[data-original-title="Italic"]', count: 1)
- assert_selector('.btn[data-original-title="Header"]', count: 1)
- assert_selector('.btn[data-original-title="Make a link"]', count: 1)
- assert_selector('.btn[data-original-title="Upload an image"]', count: 1)
- assert_selector('.btn[data-original-title="Save"]', count: 1)
- assert_selector('.btn[data-original-title="Recover"]', count: 1)
- assert_selector('.btn[data-original-title="Help"]', count: 1)
-
+ comment_response_text = 'wooly woot'
+
+ test "#{page_type_string}: addComment(comment_text)" do
+ # wiki pages' comments, unlike questions' and notes', are viewable from /wiki/wiki-page-path/comments
+ node_name == :wiki_page ? (visit nodes(node_name).path + '/comments') : (visit nodes(node_name).path)
+ page.evaluate_script("addComment('#{comment_text}')")
+ assert_selector('#comments-list .comment-body p', text: comment_text)
+ end
+
+ test "#{page_type_string}: addComment(comment_text, submit_url)" do
+ node_name == :wiki_page ? (visit nodes(node_name).path + '/comments') : (visit nodes(node_name).path)
+ page.evaluate_script("addComment('#{comment_text}', '/comment/create/#{nodes(node_name).nid.to_s}')")
+ assert_selector('#comments-list .comment-body p', text: comment_text)
+ end
+
+ test "#{page_type_string}: reply to existing comment" do
+ node_name == :wiki_page ? (visit nodes(node_name).path + '/comments') : (visit nodes(node_name).path)
+ # find comment ID of the first comment on page
+ parent_id = "#" + page.find('#comments-list').first('.comment')[:id]
+ parent_id_num = /c(\d+)/.match(parent_id)[1] # eg. comment ID format is id="c9834"
+ # addComment(comment text, submitURL, comment's parent ID)
+ page.evaluate_script("addComment(\"no you can't\", '/comment/create/#{nodes(:comment_note).nid}', #{parent_id_num})")
+ # check for comment text
+ assert_selector("#{parent_id} .comment .comment-body p", text: 'no you can\'t')
+ end
+
+ test "#{page_type_string}: comment, then reply to FRESH comment" do
+ visit nodes(:comment_question).path
+ # post new comment
+ comment_text = 'woot woot'
+ page.evaluate_script("addComment('#{comment_text}', '/comment/create/#{nodes(:comment_question).nid}')")
+ # we need the ID of parent div that contains
comment_text
:
+ parent_id = page.find('p', text: comment_text).find(:xpath, '..')[:id]
+ # regex to strip the ID number out of string. ID format is comment-body-4231
+ parent_id_num = /comment-body-(\d+)/.match(parent_id)[1]
+ # reply to comment
+ comment_response_text = 'wooly woot!'
+ # addComment(comment text, submitURL, comment's parent ID)
+ page.evaluate_script("addComment('#{comment_response_text}', '/comment/create/#{nodes(:comment_question).nid}', #{parent_id_num})")
+ # assert that
has child div[div[p[text="wooly woot!"]]]
+ assert_selector("#{'#c' + parent_id_num + 'show'} div div div p", text: comment_response_text)
+ end
+
+ test "#{page_type_string}: manual comment and reply to comment" do
+ node_name == :wiki_page ? (visit nodes(node_name).path + '/comments') : (visit nodes(node_name).path)
+ fill_in("body", with: comment_text)
+ # preview comment
+ find("#post_comment").click
+ find("p", text: comment_text)
+ # publish comment
+ click_on "Publish"
+ find(".noty_body", text: "Comment Added!")
+ find("p", text: comment_text)
+ # replying to the comment
+ first("p", text: "Reply to this comment...").click()
+ fill_in("body", with: comment_response_text)
+ # preview reply
+ first("#post_comment").click
+ find("p", text: comment_response_text)
+ end
+
+ test "#{page_type_string}: comment preview button works" do
+ node_name == :wiki_page ? (visit nodes(node_name).path + '/comments') : (visit nodes(node_name).path)
+ find("p", text: "Reply to this comment...").click()
+ reply_preview_button = page.all('#post_comment')[0]
+ comment_preview_button = page.all('#post_comment')[1]
+ # Toggle preview
+ reply_preview_button.click()
+ # Make sure that buttons are not binded with each other
+ assert_equal( reply_preview_button.text, "Hide Preview" )
+ assert_equal( comment_preview_button.text, "Preview" )
+ end
+
+ test "#{page_type_string}: comment image upload" do
+ Capybara.ignore_hidden_elements = false
+ node_name == :wiki_page ? (visit nodes(node_name).path + '/comments') : (visit nodes(node_name).path)
+ find("p", text: "Reply to this comment...").click()
+ reply_preview_button = page.all('#post_comment')[0]
+ fileinput_element = page.all('#fileinput')[0]
+ # Upload the image
+ fileinput_element.set("#{Rails.root.to_s}/public/images/pl.png")
+ # Wait for image upload to finish
+ wait_for_ajax
+ Capybara.ignore_hidden_elements = true
+ # Toggle preview
+ reply_preview_button.click()
+ # Make sure that image has been uploaded
+ page.assert_selector('#preview img', count: 1)
+ end
+
+ test "#{page_type_string}: comment image upload by choose one" do
+ Capybara.ignore_hidden_elements = false
+ node_name == :wiki_page ? (visit nodes(node_name).path + '/comments') : (visit nodes(node_name).path)
+ find("p", text: "Reply to this comment...").click()
+ first("a", text: "choose one").click()
+ reply_preview_button = page.all('#post_comment')[0]
+ fileinput_element = page.all('#fileinput')[0]
+ # Upload the image
+ fileinput_element.set("#{Rails.root.to_s}/public/images/pl.png")
+ # Wait for image upload to finish
+ wait_for_ajax
+ Capybara.ignore_hidden_elements = true
+ # Toggle preview
+ reply_preview_button.click()
+ # Make sure that image has been uploaded
+ page.assert_selector('#preview img', count: 1)
+ end
+
+ test "#{page_type_string}: comment image drag and drop upload" do
+ Capybara.ignore_hidden_elements = false
+ node_name == :wiki_page ? (visit nodes(node_name).path + '/comments') : (visit nodes(node_name).path)
+ find("p", text: "Reply to this comment...").click()
+ reply_preview_button = page.all('#post_comment')[0]
+ # Upload the image
+ drop_in_dropzone("#{Rails.root.to_s}/public/images/pl.png", ".dropzone")
+ # Wait for image upload to finish
+ wait_for_ajax
+ Capybara.ignore_hidden_elements = true
+ # Toggle preview
+ reply_preview_button.click()
+ # Make sure that image has been uploaded
+ page.assert_selector('#preview img', count: 1)
+ end
+
+ test "#{page_type_string}: ctrl/cmd + enter comment publishing keyboard shortcut" do
+ node_name == :wiki_page ? (visit nodes(node_name).path + '/comments') : (visit nodes(node_name).path)
+ find("p", text: "Reply to this comment...").click()
+ # Write a comment
+ page.all("#text-input")[1].set("Great post!")
+ page.execute_script <<-JS
+ // Remove first text-input field
+ $("#text-input").remove()
+ var $textBox = $("#text-input");
+ // Generate fake CTRL + Enter event
+ var press = jQuery.Event("keypress");
+ press.altGraphKey = false;
+ press.altKey = false;
+ press.bubbles = true;
+ press.cancelBubble = false;
+ press.cancelable = true;
+ press.charCode = 10;
+ press.clipboardData = undefined;
+ press.ctrlKey = true;
+ press.currentTarget = $textBox[0];
+ press.defaultPrevented = false;
+ press.detail = 0;
+ press.eventPhase = 2;
+ press.keyCode = 10;
+ press.keyIdentifier = "";
+ press.keyLocation = 0;
+ press.layerX = 0;
+ press.layerY = 0;
+ press.metaKey = false;
+ press.pageX = 0;
+ press.pageY = 0;
+ press.returnValue = true;
+ press.shiftKey = false;
+ press.srcElement = $textBox[0];
+ press.target = $textBox[0];
+ press.type = "keypress";
+ press.view = Window;
+ press.which = 10;
+ // Emit fake CTRL + Enter event
+ $textBox.trigger(press);
+ JS
+ assert_selector('#comments-list .comment', count: 2)
+ assert_selector('.noty_body', text: 'Comment Added!')
+ end
+
+ test "#{page_type_string}: comment deletion" do
+ node_name == :wiki_page ? (visit nodes(node_name).path + '/comments') : (visit nodes(node_name).path)
+ # Create a comment
+ page.execute_script <<-JS
+ var commentForm = $('.comment-form-wrapper')[1];
+ var submitCommentBtn = $(commentForm).find('.btn-primary')[0];
+ var commentTextarea = $(commentForm).find('#text-input')[0]
+ $(commentTextarea).val('Great post Jeff!')
+ $(submitCommentBtn).click()
+ JS
+ # Delete a comment
+ find('.btn[data-original-title="Delete comment"]', match: :first).click()
+ # Click "confirm" on modal
+ page.evaluate_script('document.querySelector(".jconfirm-buttons .btn:first-of-type").click()')
+ assert_selector('#comments-list .comment', count: 1)
+ assert_selector('.noty_body', text: 'Comment deleted')
+ end
+
+ test "#{page_type_string}: formatting toolbar is rendered" do
+ node_name == :wiki_page ? (visit nodes(node_name).path + '/comments') : (visit nodes(node_name).path)
+ assert_selector('.btn[data-original-title="Bold"]', count: 1)
+ assert_selector('.btn[data-original-title="Italic"]', count: 1)
+ assert_selector('.btn[data-original-title="Header"]', count: 1)
+ assert_selector('.btn[data-original-title="Make a link"]', count: 1)
+ assert_selector('.btn[data-original-title="Upload an image"]', count: 1)
+ assert_selector('.btn[data-original-title="Save"]', count: 1)
+ assert_selector('.btn[data-original-title="Recover"]', count: 1)
+ assert_selector('.btn[data-original-title="Help"]', count: 1)
+ end
+
+ test "#{page_type_string}: edit comment" do
+ node_name == :wiki_page ? (visit nodes(node_name).path + '/comments') : (visit nodes(node_name).path)
+ # Create a comment
+ page.execute_script <<-JS
+ var commentForm = $('.comment-form-wrapper')[1];
+ var submitCommentBtn = $(commentForm).find('.btn-primary')[0];
+ var commentTextarea = $(commentForm).find('#text-input')[0]
+ // Fill the form
+ $(commentTextarea).val('Great post Jeff!')
+ $(submitCommentBtn).click()
+ JS
+ # Wait for comment to upload
+ wait_for_ajax
+ # Edit the comment
+ page.execute_script <<-JS
+ var comment = $(".comment")[1];
+ var commentID = comment.id;
+ var editCommentBtn = $(comment).find('.navbar-text #edit-comment-btn')
+ // Toggle edit mode
+ $(editCommentBtn).click()
+ var commentTextarea = $('#' + commentID + 'text');
+ $(commentTextarea).val('Updated comment.')
+ var submitCommentBtn = $('#' + commentID + ' .control-group .btn-primary')[1];
+ $(submitCommentBtn).click()
+ JS
+ message = find('.alert-success', match: :first).text
+ assert_equal( "×\nComment updated.", message)
+ end
+
+ test "#{page_type_string}: react and unreact to comment" do
+ node_name == :wiki_page ? (visit nodes(node_name).path + '/comments') : (visit nodes(node_name).path)
+ first(".comment #dropdownMenuButton").click()
+ # click on thumbs up
+ find("img[src='https://github.githubassets.com/images/icons/emoji/unicode/1f44d.png']").click()
+ page.assert_selector("button[data-original-title='jeff reacted with thumbs up emoji']")
+ first("img[src='https://github.githubassets.com/images/icons/emoji/unicode/1f44d.png']").click()
+ page.assert_no_selector("button[data-original-title='jeff reacted with thumbs up emoji'")
+ end
end
-
- test 'comment editing' do
- visit "/wiki/wiki-page-path/comments"
-
- # Create a comment
- page.execute_script <<-JS
- var commentForm = $('.comment-form-wrapper')[1];
- var submitCommentBtn = $(commentForm).find('.btn-primary')[0];
- var commentTextarea = $(commentForm).find('#text-input')[0]
-
- // Fill the form
- $(commentTextarea).val('Great post Jeff!')
- $(submitCommentBtn).click()
- JS
-
- # Wait for comment to upload
- wait_for_ajax
-
- # Edit the comment
- page.execute_script <<-JS
- var comment = $(".comment")[1];
- var commentID = comment.id;
- var editCommentBtn = $(comment).find('.navbar-text #edit-comment-btn')
-
- // Toggle edit mode
- $(editCommentBtn).click()
-
- var commentTextarea = $('#' + commentID + 'text');
- $(commentTextarea).val('Updated comment.')
-
- var submitCommentBtn = $('#' + commentID + ' .control-group .btn-primary')[1];
- $(submitCommentBtn).click()
- JS
-
- message = find('.alert-success', match: :first).text
- assert_equal( "×\nComment updated.", message)
- end
-
- test "reacting and unreacting to comment" do
- note = nodes(:one)
- visit note.path
-
- first(".comment #dropdownMenuButton").click()
-
- # click on thumbs up
- find("img[src='https://github.githubassets.com/images/icons/emoji/unicode/1f44d.png']").click()
- page.assert_selector("button[data-original-title='jeff reacted with thumbs up emoji']")
-
- first("img[src='https://github.githubassets.com/images/icons/emoji/unicode/1f44d.png']").click()
- page.assert_no_selector("button[data-original-title='jeff reacted with thumbs up emoji'")
- end
-
end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 571171ebdb..e2755a99f8 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -40,6 +40,14 @@ def available_testing_locales
I18n.available_locales
end
+# used in comment_test.rb
+def page_types
+ {
+ :note => :comment_note,
+ :question => :comment_question,
+ :wiki => :wiki_page
+ }
+end
WebMock.allow_net_connect!
WebMock.stub_request(:any, "publiclab.org/api/srch/nearbyPeople")
diff --git a/test/unit/node_test.rb b/test/unit/node_test.rb
index c9247c413f..7a72371e85 100644
--- a/test/unit/node_test.rb
+++ b/test/unit/node_test.rb
@@ -359,7 +359,7 @@ def setup
test 'should find all questions' do
questions = Node.questions
- expected = [nodes(:question), nodes(:question2), nodes(:first_timer_question), nodes(:question3), nodes(:sun_question), nodes(:question4)]
+ expected = [nodes(:question), nodes(:question2), nodes(:first_timer_question), nodes(:question3), nodes(:sun_question), nodes(:comment_question)]
assert_equal expected, questions
end