-
Notifications
You must be signed in to change notification settings - Fork 1.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add more tests for Node (for note and wiki page titles) #6366
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,12 @@ | ||
class UniqueUrlValidator < ActiveModel::Validator | ||
def validate(record) | ||
if record.title == '' || record.title.nil? | ||
# record.errors[:base] << "You must provide a title." | ||
if record.title.blank? | ||
record.errors[:base] << "You must provide a title." | ||
# otherwise the below title uniqueness check fails, as title presence validation doesn't run until after | ||
elsif record.type == 'page' | ||
array = %w(create edit update delete new) | ||
array.each do |x| | ||
if record.title == x | ||
record.errors[:base] << "You may not use the title '" + x + "'" | ||
end | ||
if array.include? record.title.downcase | ||
record.errors[:base] << "You may not use the title '#{record.title}'" | ||
end | ||
else | ||
if !Node.where(path: record.generate_path).first.nil? && record.type == 'note' | ||
|
@@ -96,7 +94,7 @@ def updated_month | |
|
||
belongs_to :user, foreign_key: 'uid' | ||
|
||
validates :title, presence: true | ||
validates :title, presence: true, length: { minimum: 3 } | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Anyone thinks the minimum length of the title should be longer/shorter? |
||
validates_with UniqueUrlValidator, on: :create | ||
|
||
scope :published, -> { where(status: 1) } | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -210,6 +210,41 @@ def setup | |
assert_equal 'Wiki page content/body', node.body | ||
end | ||
|
||
test 'wikipage with wrong title should not be created' do | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please compare this with the test on line 190 |
||
node = Node.new(uid: users(:bob).id, | ||
type: 'page') | ||
words = %w(create update delete new edit) | ||
words.each do |word| | ||
node.title = word.capitalize | ||
assert_not node.save | ||
end | ||
end | ||
|
||
test 'research note with empty/blank title should not be created' do | ||
node = Node.new(uid: users(:bob).id, | ||
type: 'note') | ||
titles = [ '', ' ' * 5 ] | ||
titles.each do |t| | ||
node.title = t | ||
assert_not node.valid? | ||
end | ||
end | ||
|
||
test 'research note with duplicate title should not be created' do | ||
node = Node.new(uid: users(:bob).id, | ||
type: 'note', | ||
title: 'My research note') | ||
dup_node = node.dup | ||
node.save | ||
assert_not dup_node.save | ||
end | ||
|
||
test 'title should not be too short' do | ||
node = Node.new(uid: users(:bob).id, | ||
type: 'note', | ||
title: 'ok') | ||
assert_not node.valid? | ||
end | ||
test 'create a node_revision' do | ||
# in testing, uid and id should be matched, although this is not yet true in production db | ||
revision_count = nodes(:one).revisions.length | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oddly, tests are passing whether or not the title is checked for blankness!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this really needed? Isn't it covered by:
validates title, presence: true, ....
(on line 97)