Non-interactive AWS install by running a single script.

Merge branch 'master' into non-interactive-aws-install

Conflicts:
	doc/installation.md

Fix merge mess in installation.md

1 files changed, 9 insertions, 17 deletions

diff --git a/spec/models/snippet_spec.rb b/spec/models/snippet_spec.rb
index 9b4aaa13f74..ffb861c4910 100644
--- a/spec/models/snippet_spec.rb
+++ b/spec/models/snippet_spec.rb
@@ -3,29 +3,21 @@ require 'spec_helper'
 describe Snippet do
   describe "Associations" do
     it { should belong_to(:project) }
-    it { should belong_to(:author) }
+    it { should belong_to(:author).class_name('User') }
+    it { should have_many(:notes).dependent(:destroy) }
   end
 
   describe "Validation" do
-    it { should validate_presence_of(:title) }
     it { should validate_presence_of(:author_id) }
     it { should validate_presence_of(:project_id) }
+
+    it { should validate_presence_of(:title) }
+    it { should 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 { should validate_presence_of(:content) }
+    it { should ensure_length_of(:content).is_within(0..10_000) }
   end
 end
-# == Schema Information
-#
-# Table name: snippets
-#
-#  id         :integer(4)      not null, primary key
-#  title      :string(255)
-#  content    :text
-#  author_id  :integer(4)      not null
-#  project_id :integer(4)      not null
-#  created_at :datetime        not null
-#  updated_at :datetime        not null
-#  file_name  :string(255)
-#  expires_at :datetime
-#
-