Merge remote-tracking branch 'upstream/master'

1 files changed, 4 insertions, 4 deletions

diff --git a/spec/requests/snippets_spec.rb b/spec/requests/snippets_spec.rb
index d4811958db3..f0531a0a108 100644
--- a/spec/requests/snippets_spec.rb
+++ b/spec/requests/snippets_spec.rb
@@ -19,7 +19,7 @@ describe "Snippets" do
 
     subject { page }
 
-    it { should have_content(@snippet.title) }
+    it { should have_content(@snippet.title[0..10]) }
     it { should have_content(@snippet.project.name) }
     it { should have_content(@snippet.author.name) }
 
@@ -28,7 +28,7 @@ describe "Snippets" do
         # admin access to remove snippet
         @user.users_projects.destroy_all
         project.add_access(@user, :read, :write, :admin)
-        visit project_snippets_path(project)
+        visit edit_project_snippet_path(project, @snippet)
       end
 
       it "should remove entry" do
@@ -72,8 +72,8 @@ describe "Snippets" do
       @snippet = Factory :snippet,
         :author => @user,
         :project => project
-      visit project_snippets_path(project)
-      click_link "Edit"
+      visit project_snippet_path(project, @snippet)
+      click_link "Edit Snippet"
     end
 
     it "should open edit page" do