Merge branch 'master' into markdown-tags

Use the latest HTML pipeline gem

1 files changed, 8 insertions, 8 deletions

diff --git a/spec/models/snippet_spec.rb b/spec/models/snippet_spec.rb
index 1ef2c512c1f..e37dcc75230 100644
--- a/spec/models/snippet_spec.rb
+++ b/spec/models/snippet_spec.rb
@@ -19,22 +19,22 @@ require 'spec_helper'
 
 describe Snippet do
   describe "Associations" do
-    it { should belong_to(:author).class_name('User') }
-    it { should have_many(:notes).dependent(:destroy) }
+    it { is_expected.to belong_to(:author).class_name('User') }
+    it { is_expected.to have_many(:notes).dependent(:destroy) }
   end
 
   describe "Mass assignment" do
   end
 
   describe "Validation" do
-    it { should validate_presence_of(:author) }
+    it { is_expected.to validate_presence_of(:author) }
 
-    it { should validate_presence_of(:title) }
-    it { should ensure_length_of(:title).is_within(0..255) }
+    it { is_expected.to validate_presence_of(:title) }
+    it { is_expected.to ensure_length_of(:title).is_within(0..255) }
 
-    it { should validate_presence_of(:file_name) }
-    it { should ensure_length_of(:title).is_within(0..255) }
+    it { is_expected.to validate_presence_of(:file_name) }
+    it { is_expected.to ensure_length_of(:title).is_within(0..255) }
 
-    it { should validate_presence_of(:content) }
+    it { is_expected.to validate_presence_of(:content) }
   end
 end