Fixing rspec after upgrade to capybara pt1

app/views/snippets/show.html.haml

@@ -4,7 +4,7 @@
   = @snippet.title
   %small= @snippet.file_name
   - if can?(current_user, :admin_snippet, @project) || @snippet.author == current_user
-    = link_to "Edit", edit_project_snippet_path(@project, @snippet), class: "btn btn-small pull-right"
+    = link_to "Edit", edit_project_snippet_path(@project, @snippet), class: "btn btn-small pull-right", title: 'Edit Snippet'
 %br
 %div= render 'blob'

spec/features/gitlab_flavored_markdown_spec.rb

@@ -169,32 +169,40 @@ describe "Gitlab Flavored Markdown" do
   describe "for notes" do
     it "should render in commits#show", js: true do
       visit project_commit_path(project, commit)
-      fill_in "note_note", with: "see ##{issue.id}"
-      click_button "Add Comment"
+      within ".new_note.js-main-target-form" do
+        fill_in "note_note", with: "see ##{issue.id}"
+        click_button "Add Comment"
+      end
       page.should have_link("##{issue.id}")
     end
     it "should render in issue#show", js: true do
       visit project_issue_path(project, issue)
-      fill_in "note_note", with: "see ##{issue.id}"
-      click_button "Add Comment"
+      within ".new_note.js-main-target-form" do
+        fill_in "note_note", with: "see ##{issue.id}"
+        click_button "Add Comment"
+      end
       page.should have_link("##{issue.id}")
     end
     it "should render in merge_request#show", js: true do
       visit project_merge_request_path(project, merge_request)
-      fill_in "note_note", with: "see ##{issue.id}"
-      click_button "Add Comment"
+      within ".new_note.js-main-target-form" do
+        fill_in "note_note", with: "see ##{issue.id}"
+        click_button "Add Comment"
+      end
       page.should have_link("##{issue.id}")
     end
     it "should render in projects#wall", js: true do
       visit wall_project_path(project)
-      fill_in "note_note", with: "see ##{issue.id}"
-      click_button "Add Comment"
+      within ".new_note.js-main-target-form" do
+        fill_in "note_note", with: "see ##{issue.id}"
+        click_button "Add Comment"
+      end
       page.should have_link("##{issue.id}")
     end

spec/features/snippets_spec.rb

@@ -72,7 +72,7 @@ describe "Snippets" do
                         author: @user,
                         project: project)
       visit project_snippet_path(project, @snippet)
-      click_link "Edit"
+      click_link "Edit Snippet"
     end
     it "should open edit page" do

spec/features/users_spec.rb

+require 'spec_helper'
+
+describe 'Users' do
+  describe "GET /users/sign_up" do
+    before do
+      Gitlab.config.gitlab.stub(:signup_enabled).and_return(true)
+    end
+
+    it "should create a new user account" do
+      visit new_user_registration_path
+      fill_in "user_name", with: "Name Surname"
+      fill_in "user_username", with: "Great"
+      fill_in "user_email", with: "name@mail.com"
+      fill_in "user_password", with: "password1234"
+      fill_in "user_password_confirmation", with: "password1234"
+      expect { click_button "Sign up" }.to change {User.count}.by(1)
+    end
+  end
+end

spec/requests/api/users_spec.rb

@@ -54,32 +54,27 @@ describe Gitlab::API do
   end
   describe "GET /users/sign_up" do
-    before do
-      Gitlab.config.gitlab.stub(:signup_enabled).and_return(false)
-    end
-    it "should redirect to sign in page if signup is disabled" do
-      get "/users/sign_up"
-      response.status.should == 302
-      response.should redirect_to(new_user_session_path)
-    end
-  end
-  describe "GET /users/sign_up" do
-    before do
-      Gitlab.config.gitlab.stub(:signup_enabled).and_return(true)
-    end
-    it "should return sign up page if signup is enabled" do
-      get "/users/sign_up"
-      response.status.should == 200
+    context 'enabled' do
+      before do
+        Gitlab.config.gitlab.stub(:signup_enabled).and_return(true)
+      end
+      it "should return sign up page if signup is enabled" do
+        get "/users/sign_up"
+        response.status.should == 200
+      end
     end
-    it "should create a new user account" do
-      visit new_user_registration_path
-      fill_in "user_name", with: "Name Surname"
-      fill_in "user_username", with: "Great"
-      fill_in "user_email", with: "name@mail.com"
-      fill_in "user_password", with: "password1234"
-      fill_in "user_password_confirmation", with: "password1234"
-      expect { click_button "Sign up" }.to change {User.count}.by(1)
+
+    context 'disabled' do
+      before do
+        Gitlab.config.gitlab.stub(:signup_enabled).and_return(false)
+      end
+
+      it "should redirect to sign in page if signup is disabled" do
+        get "/users/sign_up"
+        response.status.should == 302
+        response.should redirect_to(new_user_session_path)
+      end
     end
   end