%%'").each do |p|
normalized = Import::Normalize.normalize_code_blocks(p.raw, lang)
if normalized != p.raw
- p.revise(Discourse.system_user, normalized)
+ p.revise(Discourse.system_user, { raw: normalized })
putc "."
i += 1
end
diff --git a/script/import_scripts/phpbb3.rb b/script/import_scripts/phpbb3.rb
index b4fb13f1af2..234113362c3 100644
--- a/script/import_scripts/phpbb3.rb
+++ b/script/import_scripts/phpbb3.rb
@@ -101,7 +101,7 @@ class ImportScripts::PhpBB3 < ImportScripts::Base
puts "Could not import avatar: #{err.message}"
end
end
- end
+ end
}
end
end
@@ -413,7 +413,7 @@ class ImportScripts::PhpBB3 < ImportScripts::Base
end
if new_raw != post.raw
- PostRevisor.new(post).revise!(post.user, new_raw, {bypass_bump: true, edit_reason: 'Migrate from PHPBB3'})
+ PostRevisor.new(post).revise!(post.user, { raw: new_raw }, { bypass_bump: true, edit_reason: 'Migrate from PHPBB3' })
end
end
diff --git a/spec/components/category_list_spec.rb b/spec/components/category_list_spec.rb
index 51b1b44ec2b..92475f0748c 100644
--- a/spec/components/category_list_spec.rb
+++ b/spec/components/category_list_spec.rb
@@ -86,7 +86,7 @@ describe CategoryList do
end
context "with a topic in a category" do
- let!(:topic) { Fabricate(:topic, category: topic_category)}
+ let!(:topic) { Fabricate(:topic, category: topic_category) }
let(:category) { category_list.categories.first }
it "should return the category" do
diff --git a/spec/components/post_revisor_spec.rb b/spec/components/post_revisor_spec.rb
index 90769440171..b1d710348e7 100644
--- a/spec/components/post_revisor_spec.rb
+++ b/spec/components/post_revisor_spec.rb
@@ -16,7 +16,7 @@ describe PostRevisor do
describe 'with the same body' do
it "doesn't change version" do
lambda {
- subject.revise!(post.user, post.raw).should == false
+ subject.revise!(post.user, { raw: post.raw }).should == false
post.reload
}.should_not change(post, :version)
end
@@ -25,10 +25,11 @@ describe PostRevisor do
describe 'ninja editing' do
it 'correctly applies edits' do
SiteSetting.ninja_edit_window = 1.minute.to_i
- subject.revise!(post.user, 'updated body', revised_at: post.updated_at + 10.seconds)
+ subject.revise!(post.user, { raw: 'updated body' }, revised_at: post.updated_at + 10.seconds)
post.reload
post.version.should == 1
+ post.public_version.should == 1
post.revisions.size.should == 0
post.last_version_at.should == first_version_at
subject.category_changed.should be_blank
@@ -41,7 +42,7 @@ describe PostRevisor do
before do
SiteSetting.stubs(:ninja_edit_window).returns(1.minute.to_i)
- subject.revise!(post.user, 'updated body', revised_at: revised_at)
+ subject.revise!(post.user, { raw: 'updated body' }, revised_at: revised_at)
post.reload
end
@@ -49,11 +50,12 @@ describe PostRevisor do
subject.category_changed.should be_blank
end
- it 'updates the version' do
+ it 'updates the versions' do
post.version.should == 2
+ post.public_version.should == 2
end
- it 'creates a new version' do
+ it 'creates a new revision' do
post.revisions.size.should == 1
end
@@ -64,12 +66,13 @@ describe PostRevisor do
describe "new edit window" do
before do
- subject.revise!(post.user, 'yet another updated body', revised_at: revised_at)
+ subject.revise!(post.user, { raw: 'yet another updated body' }, revised_at: revised_at)
post.reload
end
it "doesn't create a new version if you do another" do
post.version.should == 2
+ post.public_version.should == 2
end
it "doesn't change last_version_at" do
@@ -85,12 +88,13 @@ describe PostRevisor do
let!(:new_revised_at) {revised_at + 2.minutes}
before do
- subject.revise!(post.user, 'yet another, another updated body', revised_at: new_revised_at)
+ subject.revise!(post.user, { raw: 'yet another, another updated body' }, revised_at: new_revised_at)
post.reload
end
it "does create a new version after the edit window" do
post.version.should == 3
+ post.public_version.should == 3
end
it "does create a new version after the edit window" do
@@ -116,7 +120,7 @@ describe PostRevisor do
context "one paragraph description" do
before do
- subject.revise!(post.user, new_description)
+ subject.revise!(post.user, { raw: new_description })
category.reload
end
@@ -131,7 +135,7 @@ describe PostRevisor do
context "multiple paragraph description" do
before do
- subject.revise!(post.user, "#{new_description}\n\nOther content goes here.")
+ subject.revise!(post.user, { raw: "#{new_description}\n\nOther content goes here." })
category.reload
end
@@ -147,7 +151,7 @@ describe PostRevisor do
context 'when updating back to the original paragraph' do
before do
category.update_column(:description, 'this is my description')
- subject.revise!(post.user, Category.post_template)
+ subject.revise!(post.user, { raw: Category.post_template })
category.reload
end
@@ -167,7 +171,7 @@ describe PostRevisor do
it "triggers a rate limiter" do
EditRateLimiter.any_instance.expects(:performed!)
- subject.revise!(changed_by, 'updated body')
+ subject.revise!(changed_by, { raw: 'updated body' })
end
end
@@ -178,7 +182,7 @@ describe PostRevisor do
SiteSetting.stubs(:newuser_max_images).returns(0)
url = "http://i.imgur.com/wfn7rgU.jpg"
Oneboxer.stubs(:onebox).with(url, anything).returns("
")
- subject.revise!(changed_by, "So, post them here!\n#{url}")
+ subject.revise!(changed_by, { raw: "So, post them here!\n#{url}" })
end
it "allows an admin to insert images into a new user's post" do
@@ -196,7 +200,7 @@ describe PostRevisor do
SiteSetting.stubs(:newuser_max_images).returns(0)
url = "http://i.imgur.com/FGg7Vzu.gif"
Oneboxer.stubs(:cached_onebox).with(url, anything).returns("")
- subject.revise!(post.user, "So, post them here!\n#{url}")
+ subject.revise!(post.user, { raw: "So, post them here!\n#{url}" })
end
it "doesn't allow images to be inserted" do
@@ -208,7 +212,7 @@ describe PostRevisor do
describe 'with a new body' do
let(:changed_by) { Fabricate(:coding_horror) }
- let!(:result) { subject.revise!(changed_by, "lets update the body") }
+ let!(:result) { subject.revise!(changed_by, { raw: "lets update the body" }) }
it 'returns true' do
result.should == true
@@ -222,8 +226,9 @@ describe PostRevisor do
post.invalidate_oneboxes.should == true
end
- it 'increased the version' do
+ it 'increased the versions' do
post.version.should == 2
+ post.public_version.should == 2
end
it 'has the new revision' do
@@ -242,16 +247,14 @@ describe PostRevisor do
context 'second poster posts again quickly' do
before do
- SiteSetting.expects(:ninja_edit_window).returns(1.minute.to_i)
- subject.revise!(changed_by, 'yet another updated body', revised_at: post.updated_at + 10.seconds)
+ SiteSetting.stubs(:ninja_edit_window).returns(1.minute.to_i)
+ subject.revise!(changed_by, { raw: 'yet another updated body' }, revised_at: post.updated_at + 10.seconds)
post.reload
end
it 'is a ninja edit, because the second poster posted again quickly' do
post.version.should == 2
- end
-
- it 'is a ninja edit, because the second poster posted again quickly' do
+ post.public_version.should == 2
post.revisions.size.should == 1
end
end
@@ -262,19 +265,19 @@ describe PostRevisor do
revisor = described_class.new(post)
first_post = topic.posts.by_post_number.first
expect {
- revisor.revise!(first_post.user, 'Edit the first post', revised_at: first_post.updated_at + 10.seconds)
+ revisor.revise!(first_post.user, { raw: 'Edit the first post' }, revised_at: first_post.updated_at + 10.seconds)
topic.reload
}.to change { topic.excerpt }
second_post = Fabricate(:post, post_args.merge(post_number: 2, topic_id: topic.id))
expect {
- described_class.new(second_post).revise!(second_post.user, 'Edit the 2nd post')
+ described_class.new(second_post).revise!(second_post.user, { raw: 'Edit the 2nd post' })
topic.reload
}.to_not change { topic.excerpt }
end
end
it "doesn't strip starting whitespaces" do
- subject.revise!(post.user, " <-- whitespaces --> ")
+ subject.revise!(post.user, { raw: " <-- whitespaces --> " })
post.reload
post.raw.should == " <-- whitespaces -->"
end
diff --git a/spec/controllers/posts_controller_spec.rb b/spec/controllers/posts_controller_spec.rb
index dd28e3af048..5305ff49b1a 100644
--- a/spec/controllers/posts_controller_spec.rb
+++ b/spec/controllers/posts_controller_spec.rb
@@ -307,7 +307,7 @@ describe PostsController do
end
it "calls revise with valid parameters" do
- PostRevisor.any_instance.expects(:revise!).with(post.user, 'edited body', edit_reason: 'typo')
+ PostRevisor.any_instance.expects(:revise!).with(post.user, { raw: 'edited body' , edit_reason: 'typo' })
xhr :put, :update, update_params
end
@@ -605,7 +605,8 @@ describe PostsController do
describe "revisions" do
- let(:post_revision) { Fabricate(:post_revision) }
+ let(:post) { Fabricate(:post, version: 2) }
+ let(:post_revision) { Fabricate(:post_revision, post: post) }
it "throws an exception when revision is < 2" do
expect {
@@ -636,7 +637,7 @@ describe PostsController do
it "ensures poster can see the revisions" do
user = log_in(:active_user)
- post = Fabricate(:post, user: user)
+ post = Fabricate(:post, user: user, version: 3)
pr = Fabricate(:post_revision, user: user, post: post)
xhr :get, :revisions, post_id: pr.post_id, revision: pr.number
response.should be_success
@@ -663,7 +664,7 @@ describe PostsController do
context "deleted post" do
let(:admin) { log_in(:admin) }
- let(:deleted_post) { Fabricate(:post, user: admin) }
+ let(:deleted_post) { Fabricate(:post, user: admin, version: 3) }
let(:deleted_post_revision) { Fabricate(:post_revision, user: admin, post: deleted_post) }
before { deleted_post.trash!(admin) }
@@ -677,7 +678,7 @@ describe PostsController do
context "deleted topic" do
let(:admin) { log_in(:admin) }
let(:deleted_topic) { Fabricate(:topic, user: admin) }
- let(:post) { Fabricate(:post, user: admin, topic: deleted_topic) }
+ let(:post) { Fabricate(:post, user: admin, topic: deleted_topic, version: 3) }
let(:post_revision) { Fabricate(:post_revision, user: admin, post: post) }
before { deleted_topic.trash!(admin) }
diff --git a/spec/controllers/topics_controller_spec.rb b/spec/controllers/topics_controller_spec.rb
index 3a59449adc9..d8500e82d01 100644
--- a/spec/controllers/topics_controller_spec.rb
+++ b/spec/controllers/topics_controller_spec.rb
@@ -733,6 +733,7 @@ describe TopicsController do
describe 'when logged in' do
before do
@topic = Fabricate(:topic, user: log_in)
+ Fabricate(:post, topic: @topic)
end
describe 'without permission' do
@@ -778,7 +779,7 @@ describe TopicsController do
it "returns errors with invalid categories" do
Topic.any_instance.expects(:change_category_to_id).returns(false)
- xhr :put, :update, topic_id: @topic.id, slug: @topic.title
+ xhr :put, :update, topic_id: @topic.id, slug: @topic.title, category_id: -1
expect(response).not_to be_success
end
diff --git a/spec/fabricators/post_revision_fabricator.rb b/spec/fabricators/post_revision_fabricator.rb
index 5a977b23829..43cc8f67bd0 100644
--- a/spec/fabricators/post_revision_fabricator.rb
+++ b/spec/fabricators/post_revision_fabricator.rb
@@ -1,7 +1,7 @@
Fabricator(:post_revision) do
post
user
- number 3
+ number 2
modifications do
{ "cooked" => ["BEFORE
", "AFTER
"], "raw" => ["BEFORE", "AFTER"] }
end
diff --git a/spec/models/category_spec.rb b/spec/models/category_spec.rb
index 192f498906c..f366b566c35 100644
--- a/spec/models/category_spec.rb
+++ b/spec/models/category_spec.rb
@@ -368,7 +368,7 @@ describe Category do
post = create_post(user: @category.user, category: @category.name)
SiteSetting.stubs(:ninja_edit_window).returns(1.minute.to_i)
- post.revise(post.user, 'updated body', revised_at: post.updated_at + 2.minutes)
+ post.revise(post.user, { raw: 'updated body' }, revised_at: post.updated_at + 2.minutes)
Category.update_stats
@category.reload
diff --git a/spec/models/draft_spec.rb b/spec/models/draft_spec.rb
index e62f667dda2..4ef4f3baebe 100644
--- a/spec/models/draft_spec.rb
+++ b/spec/models/draft_spec.rb
@@ -73,7 +73,7 @@ describe Draft do
it 'nukes the post draft when a post is revised' do
p = Fabricate(:post)
Draft.set(p.user, p.topic.draft_key, 0,'hello')
- p.revise(p.user, 'another test')
+ p.revise(p.user, { raw: 'another test' })
s = DraftSequence.current(p.user, p.topic.draft_key)
Draft.get(p.user, p.topic.draft_key, s).should == nil
end
diff --git a/spec/models/post_action_spec.rb b/spec/models/post_action_spec.rb
index 811694349f2..f1501538328 100644
--- a/spec/models/post_action_spec.rb
+++ b/spec/models/post_action_spec.rb
@@ -297,7 +297,7 @@ describe PostAction do
post.hidden_reason_id.should == Post.hidden_reasons[:flag_threshold_reached]
post.topic.visible.should == false
- post.revise(post.user, post.raw + " ha I edited it ")
+ post.revise(post.user, { raw: post.raw + " ha I edited it " })
post.reload
@@ -316,7 +316,7 @@ describe PostAction do
post.hidden_reason_id.should == Post.hidden_reasons[:flag_threshold_reached_again]
post.topic.visible.should == false
- post.revise(post.user, post.raw + " ha I edited it again ")
+ post.revise(post.user, { raw: post.raw + " ha I edited it again " })
post.reload
diff --git a/spec/models/post_alert_observer_spec.rb b/spec/models/post_alert_observer_spec.rb
index 3ff4802b379..e61d84d04d3 100644
--- a/spec/models/post_alert_observer_spec.rb
+++ b/spec/models/post_alert_observer_spec.rb
@@ -36,7 +36,7 @@ describe PostAlertObserver do
context 'when editing a post' do
it 'notifies a user of the revision' do
lambda {
- post.revise(evil_trout, "world is the new body of the message")
+ post.revise(evil_trout, { raw: "world is the new body of the message" })
}.should change(post.user.notifications, :count).by(1)
end
@@ -47,13 +47,13 @@ describe PostAlertObserver do
it 'notifies a user of the revision made by another user' do
lambda {
- post.revise(evil_trout, "world is the new body of the message")
+ post.revise(evil_trout, { raw: "world is the new body of the message" })
}.should change(post.user.notifications, :count).by(1)
end
it 'does not notifiy a user of the revision made by the system user' do
lambda {
- post.revise(Discourse.system_user, "world is the new body of the message")
+ post.revise(Discourse.system_user, { raw: "world is the new body of the message" })
}.should_not change(post.user.notifications, :count)
end
diff --git a/spec/models/post_revision_spec.rb b/spec/models/post_revision_spec.rb
deleted file mode 100644
index b19bacb0639..00000000000
--- a/spec/models/post_revision_spec.rb
+++ /dev/null
@@ -1,119 +0,0 @@
-require 'spec_helper'
-require_dependency 'post_revision'
-
-describe PostRevision do
-
- before do
- @number = 1
- end
-
- def create_rev(modifications, post_id=1)
- @number += 1
- PostRevision.create!(post_id: post_id, user_id: 1, number: @number, modifications: modifications)
- end
-
- it "ignores deprecated current values in history" do
- p = PostRevision.new(modifications: {"foo" => ["bar", "bar1"]})
- p.previous("foo").should == "bar"
- p.current("foo").should == "bar"
- end
-
- it "can fallback to previous revisions if needed" do
- r1 = create_rev("foo" => ["A", "B"])
- r2 = create_rev("foo" => ["C", "D"])
-
- r1.current("foo").should == "C"
- r2.current("foo").should == "C"
- r2.previous("foo").should == "C"
- end
-
- it "can fallback to post if needed" do
- post = Fabricate(:post)
- r = create_rev({"foo" => ["A", "B"]}, post.id)
-
- r.current("raw").should == post.raw
- r.previous("raw").should == post.raw
- r.current("cooked").should == post.cooked
- r.previous("cooked").should == post.cooked
- end
-
- it "can fallback to post for current rev only if needed" do
- post = Fabricate(:post)
- r = create_rev({"raw" => ["A"], "cooked" => ["AA"]}, post.id)
-
- r.current("raw").should == post.raw
- r.previous("raw").should == "A"
- r.current("cooked").should == post.cooked
- r.previous("cooked").should == "AA"
- end
-
- it "can fallback to topic if needed" do
- post = Fabricate(:post)
- r = create_rev({"foo" => ["A", "B"]}, post.id)
-
- r.current("title").should == post.topic.title
- r.previous("title").should == post.topic.title
- end
-
- it "can find title changes" do
- r1 = create_rev({"title" => ["hello"]})
- r2 = create_rev({"title" => ["frog"]})
- r1.title_changes[:inline].should =~ /frog.*hello/
- r1.title_changes[:side_by_side].should =~ /hello.*frog/
- end
-
- it "can find category changes" do
- cat1 = Fabricate(:category, name: "cat1")
- cat2 = Fabricate(:category, name: "cat2")
-
- r1 = create_rev({"category_id" => [cat1.id, cat2.id]})
- r2 = create_rev({"category_id" => [cat2.id, cat1.id]})
-
- changes = r1.category_changes
- changes[:previous_category_id].should == cat1.id
- changes[:current_category_id].should == cat2.id
-
- end
-
- it "can find wiki changes" do
- r1 = create_rev("wiki" => [false])
- r2 = create_rev("wiki" => [true])
-
- changes = r1.wiki_changes
- changes[:previous_wiki].should == false
- changes[:current_wiki].should == true
- end
-
- it "can find post_type changes" do
- r1 = create_rev("post_type" => [1])
- r2 = create_rev("post_type" => [2])
-
- changes = r1.post_type_changes
- changes[:previous_post_type].should == 1
- changes[:current_post_type].should == 2
- end
-
- it "hides revisions that were hidden" do
- r1 = create_rev({"raw" => ["one"]})
- r2 = create_rev({"raw" => ["two"]})
- r3 = create_rev({"raw" => ["three"]})
-
- r2.hide!
-
- r1.current("raw").should == "three"
- r2.previous("raw").should == "one"
- end
-
- it "shows revisions that were shown" do
- r1 = create_rev({"raw" => ["one"]})
- r2 = create_rev({"raw" => ["two"]})
- r3 = create_rev({"raw" => ["three"]})
-
- r2.hide!
- r2.show!
-
- r2.previous("raw").should == "two"
- r1.current("raw").should == "two"
- end
-
-end
diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb
index b7d8901688c..6b21e685240 100644
--- a/spec/models/post_spec.rb
+++ b/spec/models/post_spec.rb
@@ -161,7 +161,7 @@ describe Post do
post_no_images.user.trust_level = TrustLevel[0]
post_no_images.save
-> {
- post_no_images.revise(post_no_images.user, post_two_images.raw)
+ post_no_images.revise(post_no_images.user, { raw: post_two_images.raw })
post_no_images.reload
}.should_not change(post_no_images, :raw)
end
@@ -209,7 +209,7 @@ describe Post do
post_no_attachments.user.trust_level = TrustLevel[0]
post_no_attachments.save
-> {
- post_no_attachments.revise(post_no_attachments.user, post_two_attachments.raw)
+ post_no_attachments.revise(post_no_attachments.user, { raw: post_two_attachments.raw })
post_no_attachments.reload
}.should_not change(post_no_attachments, :raw)
end
@@ -468,83 +468,56 @@ describe Post do
it 'has no revision' do
post.revisions.size.should == 0
first_version_at.should be_present
- post.revise(post.user, post.raw).should == false
+ post.revise(post.user, { raw: post.raw }).should == false
end
describe 'with the same body' do
it "doesn't change version" do
- lambda { post.revise(post.user, post.raw); post.reload }.should_not change(post, :version)
+ lambda { post.revise(post.user, { raw: post.raw }); post.reload }.should_not change(post, :version)
end
end
- describe 'ninja editing' do
- before do
- SiteSetting.expects(:ninja_edit_window).returns(1.minute.to_i)
- post.revise(post.user, 'updated body', revised_at: post.updated_at + 10.seconds)
- post.reload
- end
+ describe 'ninja editing & edit windows' do
- it 'causes no update' do
+ before { SiteSetting.stubs(:ninja_edit_window).returns(1.minute.to_i) }
+
+ it 'works' do
+ revised_at = post.updated_at + 2.minutes
+ new_revised_at = revised_at + 2.minutes
+
+ # ninja edit
+ post.revise(post.user, { raw: 'updated body' }, revised_at: post.updated_at + 10.seconds)
+ post.reload
post.version.should == 1
+ post.public_version.should == 1
post.revisions.size.should == 0
- post.last_version_at.should == first_version_at
- end
+ post.last_version_at.to_i.should == first_version_at.to_i
- end
-
- describe 'revision much later' do
-
- let!(:revised_at) { post.updated_at + 2.minutes }
-
- before do
- SiteSetting.stubs(:ninja_edit_window).returns(1.minute.to_i)
- post.revise(post.user, 'updated body', revised_at: revised_at)
+ # revision much later
+ post.revise(post.user, { raw: 'another updated body' }, revised_at: revised_at)
post.reload
- end
-
- it 'updates the version' do
post.version.should == 2
+ post.public_version.should == 2
post.revisions.size.should == 1
post.last_version_at.to_i.should == revised_at.to_i
- end
-
- describe "new edit window" do
-
- before do
- post.revise(post.user, 'yet another updated body', revised_at: revised_at)
- post.reload
- end
-
- it "doesn't create a new version if you do another" do
- post.version.should == 2
- end
-
- it "doesn't change last_version_at" do
- post.last_version_at.to_i.should == revised_at.to_i
- end
-
- context "after second window" do
-
- let!(:new_revised_at) {revised_at + 2.minutes}
-
- before do
- post.revise(post.user, 'yet another, another updated body', revised_at: new_revised_at)
- post.reload
- end
-
- it "does create a new version after the edit window" do
- post.version.should == 3
- end
-
- it "does create a new version after the edit window" do
- post.last_version_at.to_i.should == new_revised_at.to_i
- end
-
- end
+ # new edit window
+ post.revise(post.user, { raw: 'yet another updated body' }, revised_at: revised_at + 10.seconds)
+ post.reload
+ post.version.should == 2
+ post.public_version.should == 2
+ post.revisions.size.should == 1
+ post.last_version_at.to_i.should == revised_at.to_i
+ # after second window
+ post.revise(post.user, { raw: 'yet another, another updated body' }, revised_at: new_revised_at)
+ post.reload
+ post.version.should == 3
+ post.public_version.should == 3
+ post.revisions.size.should == 2
+ post.last_version_at.to_i.should == new_revised_at.to_i
end
end
@@ -554,38 +527,40 @@ describe Post do
it "triggers a rate limiter" do
EditRateLimiter.any_instance.expects(:performed!)
- post.revise(changed_by, 'updated body')
+ post.revise(changed_by, { raw: 'updated body' })
end
end
describe 'with a new body' do
let(:changed_by) { Fabricate(:coding_horror) }
- let!(:result) { post.revise(changed_by, 'updated body') }
+ let!(:result) { post.revise(changed_by, { raw: 'updated body' }) }
it 'acts correctly' do
result.should == true
post.raw.should == 'updated body'
post.invalidate_oneboxes.should == true
post.version.should == 2
+ post.public_version.should == 2
post.revisions.size.should == 1
post.revisions.first.user.should be_present
end
context 'second poster posts again quickly' do
- before do
- SiteSetting.expects(:ninja_edit_window).returns(1.minute.to_i)
- post.revise(changed_by, 'yet another updated body', revised_at: post.updated_at + 10.seconds)
- post.reload
- end
it 'is a ninja edit, because the second poster posted again quickly' do
+ SiteSetting.expects(:ninja_edit_window).returns(1.minute.to_i)
+ post.revise(changed_by, { raw: 'yet another updated body' }, revised_at: post.updated_at + 10.seconds)
+ post.reload
+
post.version.should == 2
+ post.public_version.should == 2
post.revisions.size.should == 1
end
end
end
+
end
diff --git a/spec/models/topic_link_spec.rb b/spec/models/topic_link_spec.rb
index e561ded7057..cbe5744aade 100644
--- a/spec/models/topic_link_spec.rb
+++ b/spec/models/topic_link_spec.rb
@@ -118,7 +118,7 @@ http://b.com/#{'a'*500}
context 'removing a link' do
before do
- post.revise(post.user, "no more linkies")
+ post.revise(post.user, { raw: "no more linkies" })
TopicLink.extract_from(post)
end
diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb
index 2c2a44c00bb..f8ca3809f12 100644
--- a/spec/models/topic_spec.rb
+++ b/spec/models/topic_spec.rb
@@ -352,21 +352,21 @@ describe Topic do
it "doesn't bump the topic on an edit to the last post that doesn't result in a new version" do
lambda {
SiteSetting.expects(:ninja_edit_window).returns(5.minutes)
- @last_post.revise(@last_post.user, 'updated contents', revised_at: @last_post.created_at + 10.seconds)
+ @last_post.revise(@last_post.user, { raw: 'updated contents' }, revised_at: @last_post.created_at + 10.seconds)
@topic.reload
}.should_not change(@topic, :bumped_at)
end
it "bumps the topic when a new version is made of the last post" do
lambda {
- @last_post.revise(Fabricate(:moderator), 'updated contents')
+ @last_post.revise(Fabricate(:moderator), { raw: 'updated contents' })
@topic.reload
}.should change(@topic, :bumped_at)
end
it "doesn't bump the topic when a post that isn't the last post receives a new version" do
lambda {
- @earlier_post.revise(Fabricate(:moderator), 'updated contents')
+ @earlier_post.revise(Fabricate(:moderator), { raw: 'updated contents' })
@topic.reload
}.should_not change(@topic, :bumped_at)
end
@@ -689,16 +689,17 @@ describe Topic do
end
describe 'with category' do
+
before do
@category = Fabricate(:category)
end
it "should not increase the topic_count with no category" do
- lambda { Fabricate(:topic, user: @category.user); @category.reload }.should_not change(@category, :topic_count)
+ -> { Fabricate(:topic, user: @category.user); @category.reload }.should_not change(@category, :topic_count)
end
it "should increase the category's topic_count" do
- lambda { Fabricate(:topic, user: @category.user, category_id: @category.id); @category.reload }.should change(@category, :topic_count).by(1)
+ -> { Fabricate(:topic, user: @category.user, category_id: @category.id); @category.reload }.should change(@category, :topic_count).by(1)
end
end
@@ -777,74 +778,6 @@ describe Topic do
end
end
- describe 'revisions' do
- let(:post) { Fabricate(:post) }
- let(:topic) { post.topic }
-
- it "has no revisions by default" do
- post.revisions.size.should == 0
- end
-
- context 'changing title' do
-
- before do
- topic.title = "new title for the topic"
- topic.save
- end
-
- it "creates a new revision" do
- post.revisions.size.should == 1
- end
-
- end
-
- context 'changing category' do
- let(:category) { Fabricate(:category) }
-
- it "creates a new revision" do
- topic.change_category_to_id(category.id)
- post.revisions.size.should == 1
- end
-
- it "does nothing for private messages" do
- topic.archetype = "private_message"
- topic.category_id = nil
-
- topic.change_category_to_id(category.id)
- topic.category_id.should == nil
- end
-
- context "removing a category" do
- before do
- topic.change_category_to_id(category.id)
- topic.change_category_to_id(nil)
- end
-
- it "creates a new revision" do
- post.revisions.size.should == 2
- last_rev = post.revisions.order(:number).last
- last_rev.previous("category_id").should == category.id
- last_rev.current("category_id").should == SiteSetting.uncategorized_category_id
- post.reload
- post.version.should == 3
- end
- end
-
- end
-
- context 'bumping the topic' do
- before do
- topic.bumped_at = 10.minutes.from_now
- topic.save
- end
-
- it "doesn't create a new version" do
- post.revisions.size.should == 0
- end
- end
-
- end
-
describe 'change_category' do
before do
diff --git a/spec/models/user_action_spec.rb b/spec/models/user_action_spec.rb
index 8ca87bfc261..b38f546f734 100644
--- a/spec/models/user_action_spec.rb
+++ b/spec/models/user_action_spec.rb
@@ -49,7 +49,6 @@ describe UserAction do
end
it 'includes the events correctly' do
-
mystats = stats_for_user(user)
expecting = [UserAction::NEW_TOPIC, UserAction::NEW_PRIVATE_MESSAGE, UserAction::GOT_PRIVATE_MESSAGE, UserAction::BOOKMARK].sort
mystats.should == expecting
@@ -66,7 +65,6 @@ describe UserAction do
stream_count.should == 0
# groups
-
category = Fabricate(:category, read_restricted: true)
public_topic.recover!
@@ -90,18 +88,16 @@ describe UserAction do
# duplicate should not exception out
log_test_action
-
# recategorize belongs to the right user
category2 = Fabricate(:category)
admin = Fabricate(:admin)
- public_topic.acting_user = admin
- public_topic.change_category_to_id(category2.id)
+ public_post.revise(admin, { category_id: category2.id})
action = UserAction.stream(user_id: public_topic.user_id, guardian: Guardian.new)[0]
action.acting_user_id.should == admin.id
action.action_type.should == UserAction::EDIT
-
end
+
end
describe 'when user likes' do
@@ -121,7 +117,6 @@ describe UserAction do
it "creates a new stream entry" do
PostAction.act(liker, post, PostActionType.types[:like])
likee_stream.count.should == @old_count + 1
-
end
context "successful like" do
diff --git a/spec/services/badge_granter_spec.rb b/spec/services/badge_granter_spec.rb
index 1902ff14c3b..ac76c7e9bde 100644
--- a/spec/services/badge_granter_spec.rb
+++ b/spec/services/badge_granter_spec.rb
@@ -192,7 +192,7 @@ describe BadgeGranter do
UserBadge.where(user_id: user.id, badge_id: Badge::Editor).count.should eq(0)
- PostRevisor.new(post).revise!(user, "This is my new test 1235 123")
+ PostRevisor.new(post).revise!(user, { raw: "This is my new test 1235 123" })
BadgeGranter.process_queue!
UserBadge.where(user_id: user.id, badge_id: Badge::Editor).count.should eq(1)
diff --git a/spec/services/post_alerter_spec.rb b/spec/services/post_alerter_spec.rb
index 2e581eeff6f..6c789eb7c6d 100644
--- a/spec/services/post_alerter_spec.rb
+++ b/spec/services/post_alerter_spec.rb
@@ -20,7 +20,7 @@ describe PostAlerter do
it "won't notify the user a second time on revision" do
p1 = create_post_with_alerts(raw: '[quote="Evil Trout, post:1"]whatup[/quote]')
lambda {
- p1.revise(p1.user, '[quote="Evil Trout, post:1"]whatup now?[/quote]')
+ p1.revise(p1.user, { raw: '[quote="Evil Trout, post:1"]whatup now?[/quote]' })
}.should_not change(evil_trout.notifications, :count)
end
@@ -67,7 +67,7 @@ describe PostAlerter do
it "won't notify the user a second time on revision" do
mention_post
lambda {
- mention_post.revise(mention_post.user, "New raw content that still mentions @eviltrout")
+ mention_post.revise(mention_post.user, { raw: "New raw content that still mentions @eviltrout" })
}.should_not change(evil_trout.notifications, :count)
end