move capybara scenarios to spec/features

Dmitriy Zaporozhets
1 parent 9f722427
Showing 36 changed files with 1575 additions and 1573 deletions Show diff stats
spec/features/admin/admin_hooks_spec.rb
spec/features/admin/admin_projects_spec.rb
spec/features/admin/admin_users_spec.rb
spec/features/admin/security_spec.rb
spec/features/atom/dashboard_issues_spec.rb
spec/features/atom/dashboard_spec.rb
spec/features/atom/issues_spec.rb
spec/features/gitlab_flavored_markdown_spec.rb
spec/features/issues_spec.rb
spec/features/notes_on_merge_requests_spec.rb
spec/features/notes_on_wall_spec.rb
spec/features/profile_spec.rb
spec/features/projects_deploy_keys_spec.rb
spec/features/projects_spec.rb
spec/features/search_spec.rb
spec/features/security/profile_access_spec.rb
spec/features/security/project_access_spec.rb
spec/features/snippets_spec.rb
spec/requests/admin/admin_hooks_spec.rb
spec/requests/admin/admin_projects_spec.rb
@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+describe "Admin::Hooks" do
+  before do
+    @project = create(:project)
+    login_as :admin
+
+    @system_hook = create(:system_hook)
+
+  end
+
+  describe "GET /admin/hooks" do
+    it "should be ok" do
+      visit admin_root_path
+      within ".main_menu" do
+        click_on "Hooks"
+      end
+      current_path.should == admin_hooks_path
+    end
+
+    it "should have hooks list" do
+      visit admin_hooks_path
+      page.should have_content(@system_hook.url)
+    end
+  end
+
+  describe "New Hook" do
+    before do
+      @url = Faker::Internet.uri("http")
+      visit admin_hooks_path
+      fill_in "hook_url", with: @url
+      expect { click_button "Add System Hook" }.to change(SystemHook, :count).by(1)
+    end
+
+    it "should open new hook popup" do
+      page.current_path.should == admin_hooks_path
+      page.should have_content(@url)
+    end
+  end
+
+  describe "Test" do
+    before do
+      WebMock.stub_request(:post, @system_hook.url)
+      visit admin_hooks_path
+      click_link "Test Hook"
+    end
+
+    it { page.current_path.should == admin_hooks_path }
+  end
+
+end
@@ -0,0 +1,76 @@
+require 'spec_helper'
+
+describe "Admin::Projects" do
+  before do
+    @project = create(:project)
+    login_as :admin
+  end
+
+  describe "GET /admin/projects" do
+    before do
+      visit admin_projects_path
+    end
+
+    it "should be ok" do
+      current_path.should == admin_projects_path
+    end
+
+    it "should have projects list" do
+      page.should have_content(@project.name)
+    end
+  end
+
+  describe "GET /admin/projects/:id" do
+    before do
+      visit admin_projects_path
+      click_link "#{@project.name}"
+    end
+
+    it "should have project info" do
+      page.should have_content(@project.path)
+      page.should have_content(@project.name)
+    end
+  end
+
+  describe "GET /admin/projects/:id/edit" do
+    before do
+      visit admin_projects_path
+      click_link "edit_project_#{@project.id}"
+    end
+
+    it "should have project edit page" do
+      page.should have_content("Edit project")
+      page.should have_button("Save Project")
+    end
+
+    describe "Update project" do
+      before do
+        fill_in "project_name", with: "Big Bang"
+        click_button "Save Project"
+        @project.reload
+      end
+
+      it "should show page with  new data" do
+        page.should have_content("Big Bang")
+      end
+
+      it "should change project entry" do
+        @project.name.should == "Big Bang"
+      end
+    end
+  end
+
+  describe "Add new team member" do
+    before do
+      @new_user = create(:user)
+      visit admin_project_path(@project)
+    end
+
+    it "should create new user" do
+      select @new_user.name, from: "user_ids"
+      expect { click_button "Add" }.to change { UsersProject.count }.by(1)
+      page.should have_content @new_user.name
+      current_path.should == admin_project_path(@project)
+    end
+  end
+end
@@ -0,0 +1,135 @@
+require 'spec_helper'
+
+describe "Admin::Users" do
+  before { login_as :admin }
+
+  describe "GET /admin/users" do
+    before do
+      visit admin_users_path
+    end
+
+    it "should be ok" do
+      current_path.should == admin_users_path
+    end
+
+    it "should have users list" do
+      page.should have_content(@user.email)
+      page.should have_content(@user.name)
+    end
+  end
+
+  describe "GET /admin/users/new" do
+    before do
+      @password = "123ABC"
+      visit new_admin_user_path
+      fill_in "user_name", with: "Big Bang"
+      fill_in "user_username", with: "bang"
+      fill_in "user_email", with: "bigbang@mail.com"
+      fill_in "user_password", with: @password
+      fill_in "user_password_confirmation", with: @password
+    end
+
+    it "should create new user" do
+      expect { click_button "Save" }.to change {User.count}.by(1)
+    end
+
+    it "should create user with valid data" do
+      click_button "Save"
+      user = User.last
+      user.name.should ==  "Big Bang"
+      user.email.should == "bigbang@mail.com"
+    end
+
+    it "should call send mail" do
+      Notify.should_receive(:new_user_email)
+
+      User.observers.enable :user_observer do
+        click_button "Save"
+      end
+    end
+
+    it "should send valid email to user with email & password" do
+      Gitlab.config.gitlab.stub(:signup_enabled).and_return(false)
+      User.observers.enable :user_observer do
+        click_button "Save"
+        user = User.last
+        email = ActionMailer::Base.deliveries.last
+        email.subject.should have_content("Account was created")
+        email.body.should have_content(user.email)
+        email.body.should have_content(@password)
+      end
+    end
+
+    it "should send valid email to user with email without password when signup is enabled" do
+      Gitlab.config.gitlab.stub(:signup_enabled).and_return(true)
+      User.observers.enable :user_observer do
+        click_button "Save"
+        user = User.last
+        email = ActionMailer::Base.deliveries.last
+        email.subject.should have_content("Account was created")
+        email.body.should have_content(user.email)
+        email.body.should_not have_content(@password)
+      end
+    end
+  end
+
+  describe "GET /admin/users/:id" do
+    before do
+      visit admin_users_path
+      click_link "#{@user.name}"
+    end
+
+    it "should have user info" do
+      page.should have_content(@user.email)
+      page.should have_content(@user.name)
+      page.should have_content(@user.projects_limit)
+    end
+  end
+
+  describe "GET /admin/users/:id/edit" do
+    before do
+      @simple_user = create(:user)
+      visit admin_users_path
+      click_link "edit_user_#{@simple_user.id}"
+    end
+
+    it "should have user edit page" do
+      page.should have_content("Name")
+      page.should have_content("Password")
+    end
+
+    describe "Update user" do
+      before do
+        fill_in "user_name", with: "Big Bang"
+        fill_in "user_email", with: "bigbang@mail.com"
+        check "user_admin"
+        click_button "Save"
+      end
+
+      it "should show page with  new data" do
+        page.should have_content("bigbang@mail.com")
+        page.should have_content("Big Bang")
+      end
+
+      it "should change user entry" do
+        @simple_user.reload
+        @simple_user.name.should == "Big Bang"
+        @simple_user.is_admin?.should be_true
+      end
+    end
+  end
+
+  describe "Add new project" do
+    before do
+      @new_project = create(:project)
+      visit admin_user_path(@user)
+    end
+
+    it "should create new user" do
+      select @new_project.name, from: "project_ids"
+      expect { click_button "Add" }.to change { UsersProject.count }.by(1)
+      page.should have_content @new_project.name
+      current_path.should == admin_user_path(@user)
+    end
+  end
+end
@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe "Admin::Projects" do
+  describe "GET /admin/projects" do
+    subject { admin_projects_path }
+
+    it { should be_allowed_for :admin }
+    it { should be_denied_for :user }
+    it { should be_denied_for :visitor }
+  end
+
+  describe "GET /admin/users" do
+    subject { admin_users_path }
+
+    it { should be_allowed_for :admin }
+    it { should be_denied_for :user }
+    it { should be_denied_for :visitor }
+  end
+
+  describe "GET /admin/hooks" do
+    subject { admin_hooks_path }
+
+    it { should be_allowed_for :admin }
+    it { should be_denied_for :user }
+    it { should be_denied_for :visitor }
+  end
+end
@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe "Dashboard Issues Feed" do
+  describe "GET /issues" do
+    let!(:user)     { create(:user) }
+    let!(:project1) { create(:project) }
+    let!(:project2) { create(:project) }
+    let!(:issue1)   { create(:issue, author: user, assignee: user, project: project1) }
+    let!(:issue2)   { create(:issue, author: user, assignee: user, project: project2) }
+
+    describe "atom feed" do
+      it "should render atom feed via private token" do
+        visit issues_dashboard_path(:atom, private_token: user.private_token)
+
+        page.response_headers['Content-Type'].should have_content("application/atom+xml")
+        page.body.should have_selector("title", text: "#{user.name} issues")
+        page.body.should have_selector("author email", text: issue1.author_email)
+        page.body.should have_selector("entry summary", text: issue1.title)
+        page.body.should have_selector("author email", text: issue2.author_email)
+        page.body.should have_selector("entry summary", text: issue2.title)
+      end
+    end
+  end
+end
@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe "Dashboard Feed" do
+  describe "GET /" do
+    let!(:user) { create(:user) }
+
+    context "projects atom feed via private token" do
+      it "should render projects atom feed" do
+        visit dashboard_path(:atom, private_token: user.private_token)
+        page.body.should have_selector("feed title")
+      end
+    end
+  end
+end
@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe "Issues Feed" do
+  describe "GET /issues" do
+    let!(:user)     { create(:user) }
+    let!(:project)  { create(:project, namespace: user.namespace) }
+    let!(:issue)    { create(:issue, author: user, project: project) }
+
+    before { project.team << [user, :developer] }
+
+    context "when authenticated" do
+      it "should render atom feed" do
+        login_with user
+        visit project_issues_path(project, :atom)
+
+        page.response_headers['Content-Type'].should have_content("application/atom+xml")
+        page.body.should have_selector("title", text: "#{project.name} issues")
+        page.body.should have_selector("author email", text: issue.author_email)
+        page.body.should have_selector("entry summary", text: issue.title)
+      end
+    end
+
+    context "when authenticated via private token" do
+      it "should render atom feed" do
+        visit project_issues_path(project, :atom, private_token: user.private_token)
+
+        page.response_headers['Content-Type'].should have_content("application/atom+xml")
+        page.body.should have_selector("title", text: "#{project.name} issues")
+        page.body.should have_selector("author email", text: issue.author_email)
+        page.body.should have_selector("entry summary", text: issue.title)
+      end
+    end
+  end
+end
@@ -0,0 +1,223 @@
+require 'spec_helper'
+
+describe "Gitlab Flavored Markdown" do
+  let(:project) { create(:project) }
+  let(:issue) { create(:issue, project: project) }
+  let(:merge_request) { create(:merge_request, project: project) }
+  let(:fred) do
+      u = create(:user, name: "fred")
+      project.team << [u, :master]
+      u
+  end
+
+  before do
+    # add test branch
+    @branch_name = "gfm-test"
+    r = project.repo
+    i = r.index
+    # add test file
+    @test_file = "gfm_test_file"
+    i.add(@test_file, "foo\nbar\n")
+    # add commit with gfm
+    i.commit("fix ##{issue.id}\n\nask @#{fred.username} for details", head: @branch_name)
+
+    # add test tag
+    @tag_name = "gfm-test-tag"
+    r.git.native(:tag, {}, @tag_name, commit.id)
+  end
+
+  after do
+    # delete test branch and tag
+    project.repo.git.native(:branch, {D: true}, @branch_name)
+    project.repo.git.native(:tag, {d: true}, @tag_name)
+    project.repo.gc_auto
+  end
+
+  let(:commit) { project.repository.commits(@branch_name).first }
+
+  before do
+    login_as :user
+    project.team << [@user, :developer]
+  end
+
+  describe "for commits" do
+    it "should render title in commits#index" do
+      visit project_commits_path(project, @branch_name, limit: 1)
+
+      page.should have_link("##{issue.id}")
+    end
+
+    it "should render title in commits#show" do
+      visit project_commit_path(project, commit)
+
+      page.should have_link("##{issue.id}")
+    end
+
+    it "should render description in commits#show" do
+      visit project_commit_path(project, commit)
+
+      page.should have_link("@#{fred.username}")
+    end
+
+    it "should render title in refs#tree", js: true do
+      visit project_tree_path(project, @branch_name)
+
+      within(".tree_commit") do
+        page.should have_link("##{issue.id}")
+      end
+    end
+
+    # @wip
+    #it "should render title in refs#blame" do
+      #visit project_blame_path(project, File.join(@branch_name, @test_file))
+
+      #within(".blame_commit") do
+        #page.should have_link("##{issue.id}")
+      #end
+    #end
+
+    it "should render title in repositories#branches" do
+      visit branches_project_repository_path(project)
+
+      page.should have_link("##{issue.id}")
+    end
+  end
+
+  describe "for issues" do
+    before do
+      @other_issue = create(:issue,
+                            author: @user,
+                            assignee: @user,
+                            project: project)
+      @issue = create(:issue,
+                      author: @user,
+                      assignee: @user,
+                      project: project,
+                      title: "fix ##{@other_issue.id}",
+                      description: "ask @#{fred.username} for details")
+    end
+
+    it "should render subject in issues#index" do
+      visit project_issues_path(project)
+
+      page.should have_link("##{@other_issue.id}")
+    end
+
+    it "should render subject in issues#show" do
+      visit project_issue_path(project, @issue)
+
+      page.should have_link("##{@other_issue.id}")
+    end
+
+    it "should render details in issues#show" do
+      visit project_issue_path(project, @issue)
+
+      page.should have_link("@#{fred.username}")
+    end
+  end
+
+
+  describe "for merge requests" do
+    before do
+      @merge_request = create(:merge_request,
+                              project: project,
+                              title: "fix ##{issue.id}")
+    end
+
+    it "should render title in merge_requests#index" do
+      visit project_merge_requests_path(project)
+
+      page.should have_link("##{issue.id}")
+    end
+
+    it "should render title in merge_requests#show" do
+      visit project_merge_request_path(project, @merge_request)
+
+      page.should have_link("##{issue.id}")
+    end
+  end
+
+
+  describe "for milestones" do
+    before do
+      @milestone = create(:milestone,
+                          project: project,
+                          title: "fix ##{issue.id}",
+                          description: "ask @#{fred.username} for details")
+    end
+
+    it "should render title in milestones#index" do
+      visit project_milestones_path(project)
+
+      page.should have_link("##{issue.id}")
+    end
+
+    it "should render title in milestones#show" do
+      visit project_milestone_path(project, @milestone)
+
+      page.should have_link("##{issue.id}")
+    end
+
+    it "should render description in milestones#show" do
+      visit project_milestone_path(project, @milestone)
+
+      page.should have_link("@#{fred.username}")
+    end
+  end
+
+
+  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"
+
+      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"
+
+      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"
+
+      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"
+
+      page.should have_link("##{issue.id}")
+    end
+  end
+
+
+  describe "for wikis" do
+    before do
+      visit project_wiki_path(project, :index)
+      fill_in "Title", with: "Circumvent ##{issue.id}"
+      fill_in "Content", with: "# Other pages\n\n* [Foo](foo)\n* [Bar](bar)\n\nAlso look at ##{issue.id} :-)"
+      click_on "Save"
+    end
+
+    it "should NOT render title in wikis#show" do
+      within(".content h3") do # page title
+        page.should have_content("Circumvent ##{issue.id}")
+        page.should_not have_link("##{issue.id}")
+      end
+    end
+
+    it "should render content in wikis#show" do
+      page.should have_link("##{issue.id}")
+    end
+  end
+end
@@ -0,0 +1,132 @@
+require 'spec_helper'
+
+describe "Issues" do
+  let(:project) { create(:project) }
+
+  before do
+    login_as :user
+    user2 = create(:user)
+
+    project.team << [[@user, user2], :developer]
+  end
+
+  describe "Edit issue" do
+    let!(:issue) do
+      create(:issue,
+             author: @user,
+             assignee: @user,
+             project: project)
+    end
+
+    before do
+      visit project_issues_path(project)
+      click_link "Edit"
+    end
+
+    it "should open new issue popup" do
+      page.should have_content("Issue ##{issue.id}")
+    end
+
+    describe "fill in" do
+      before do
+        fill_in "issue_title", with: "bug 345"
+        fill_in "issue_description", with: "bug description"
+      end
+
+      it { expect { click_button "Save changes" }.to_not change {Issue.count} }
+
+      it "should update issue fields" do
+        click_button "Save changes"
+
+        page.should have_content @user.name
+        page.should have_content "bug 345"
+        page.should have_content project.name
+      end
+    end
+  end
+
+  describe "Search issue", js: true do
+    before do
+      ['foobar', 'foobar2', 'gitlab'].each do |title|
+        create(:issue,
+               author: @user,
+               assignee: @user,
+               project: project,
+               title: title)
+      end
+    end
+
+    it "should be able to search on different statuses" do
+      issue = Issue.first # with title 'foobar'
+      issue.close
+
+      visit project_issues_path(project)
+      click_link 'Closed'
+      fill_in 'issue_search', with: 'foobar'
+
+      page.should have_content 'foobar'
+      page.should_not have_content 'foobar2'
+      page.should_not have_content 'gitlab'
+    end
+
+    it "should search for term and return the correct results" do
+      visit project_issues_path(project)
+      fill_in 'issue_search', with: 'foobar'
+
+      page.should have_content 'foobar'
+      page.should have_content 'foobar2'
+      page.should_not have_content 'gitlab'
+    end
+  end
+
+  describe "Filter issue" do
+    before do
+      ['foobar', 'barbaz', 'gitlab'].each do |title|
+        create(:issue,
+               author: @user,
+               assignee: @user,
+               project: project,
+               title: title)
+      end
+
+      @issue = Issue.first # with title 'foobar'
+      @issue.milestone = create(:milestone, project: project)
+      @issue.assignee = nil
+      @issue.save
+    end
+
+    let(:issue) { @issue }
+
+    it "should allow filtering by issues with no specified milestone" do
+      visit project_issues_path(project, milestone_id: '0')
+
+      page.should_not have_content 'foobar'
+      page.should have_content 'barbaz'
+      page.should have_content 'gitlab'
+    end
+
+    it "should allow filtering by a specified milestone" do
+      visit project_issues_path(project, milestone_id: issue.milestone.id)
+
+      page.should have_content 'foobar'
+      page.should_not have_content 'barbaz'
+      page.should_not have_content 'gitlab'
+    end
+
+    it "should allow filtering by issues with no specified assignee" do
+      visit project_issues_path(project, assignee_id: '0')
+
+      page.should have_content 'foobar'
+      page.should_not have_content 'barbaz'
+      page.should_not have_content 'gitlab'
+    end
+
+    it "should allow filtering by a specified assignee" do
+      visit project_issues_path(project, assignee_id: @user.id)
+
+      page.should_not have_content 'foobar'
+      page.should have_content 'barbaz'
+      page.should have_content 'gitlab'
+    end
+  end
+end
@@ -0,0 +1,234 @@
+require 'spec_helper'
+
+describe "On a merge request", js: true do
+  let!(:project) { create(:project) }
+  let!(:merge_request) { create(:merge_request, project: project) }
+
+  before do
+    login_as :user
+    project.team << [@user, :master]
+
+    visit project_merge_request_path(project, merge_request)
+  end
+
+  subject { page }
+
+  describe "the note form" do
+    # main target form creation
+    it { should have_css(".js-main-target-form", visible: true, count: 1) }
+
+    # button initalization
+    it { within(".js-main-target-form") { should have_button("Add Comment") } }
+    it { within(".js-main-target-form") { should_not have_link("Cancel") } }
+
+    # notifiactions
+    it { within(".js-main-target-form") { should have_checked_field("Notify team via email") } }
+    it { within(".js-main-target-form") { should_not have_checked_field("Notify commit author") } }
+    it { within(".js-main-target-form") { should_not have_unchecked_field("Notify commit author") } }
+
+    describe "without text" do
+      it { within(".js-main-target-form") { should have_css(".js-note-preview-button", visible: false) } }
+    end
+
+    describe "with text" do
+      before do
+        within(".js-main-target-form") do
+          fill_in "note[note]", with: "This is awesome"
+        end
+      end
+
+      it { within(".js-main-target-form") { should_not have_css(".js-comment-button[disabled]") } }
+
+      it { within(".js-main-target-form") { should have_css(".js-note-preview-button", visible: true) } }
+    end
+
+    describe "with preview" do
+      before do
+        within(".js-main-target-form") do
+          fill_in "note[note]", with: "This is awesome"
+          find(".js-note-preview-button").trigger("click")
+        end
+      end
+
+      it { within(".js-main-target-form") { should have_css(".js-note-preview", text: "This is awesome", visible: true) } }
+
+      it { within(".js-main-target-form") { should have_css(".js-note-preview-button", visible: false) } }
+      it { within(".js-main-target-form") { should have_css(".js-note-edit-button", visible: true) } }
+    end
+  end
+
+  describe "when posting a note" do
+    before do
+      within(".js-main-target-form") do
+        fill_in "note[note]", with: "This is awsome!"
+        find(".js-note-preview-button").trigger("click")
+        click_button "Add Comment"
+      end
+    end
+
+    # note added
+    it { within(".js-main-target-form") { should have_content("This is awsome!") } }
+
+    # reset form
+    it { within(".js-main-target-form") { should have_no_field("note[note]", with: "This is awesome!")  } }
+
+    # return from preview
+    it { within(".js-main-target-form") { should have_css(".js-note-preview", visible: false) } }
+    it { within(".js-main-target-form") { should have_css(".js-note-text", visible: true) } }
+
+
+    it "should be removable" do
+      find(".js-note-delete").trigger("click")
+
+      should_not have_css(".note")
+    end
+  end
+end
+
+
+
+describe "On a merge request diff", js: true, focus: true do
+  let!(:project) { create(:project) }
+  let!(:merge_request) { create(:merge_request_with_diffs, project: project) }
+
+  before do
+    login_as :user
+    project.team << [@user, :master]
+
+    visit diffs_project_merge_request_path(project, merge_request)
+
+    within '.diffs-tab' do
+      click_link("Diff")
+    end
+  end
+
+  subject { page }
+
+  describe "when adding a note" do
+    before do
+      find("#4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185.line_holder .js-add-diff-note-button").trigger("click")
+    end
+
+    describe "the notes holder" do
+      it { should have_css("#4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185.line_holder + .js-temp-notes-holder") }
+
+      it { within(".js-temp-notes-holder") { should have_css(".new_note") } }
+    end
+
+    describe "the note form" do
+      # set up hidden fields correctly
+      it { within(".js-temp-notes-holder") { find("#note_noteable_type").value.should == "MergeRequest" } }
+      it { within(".js-temp-notes-holder") { find("#note_noteable_id").value.should == merge_request.id.to_s } }
+      it { within(".js-temp-notes-holder") { find("#note_commit_id").value.should == "" } }
+      it { within(".js-temp-notes-holder") { find("#note_line_code").value.should == "4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185" } }
+
+      # buttons
+      it { should have_button("Add Comment") }
+      it { should have_css(".js-close-discussion-note-form", text: "Cancel") }
+
+      # notification options
+      it { should have_checked_field("Notify team via email") }
+
+      it "shouldn't add a second form for same row" do
+        find("#4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185.line_holder .js-add-diff-note-button").trigger("click")
+
+        should have_css("#4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185.line_holder + .js-temp-notes-holder form", count: 1)
+      end
+
+      it "should be removed when canceled" do
+        find(".js-close-discussion-note-form").trigger("click")
+
+        should have_no_css(".js-temp-notes-holder")
+      end
+    end
+  end
+
+  describe "with muliple note forms" do
+    before do
+      find("#4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185.line_holder .js-add-diff-note-button").trigger("click")
+      find("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder .js-add-diff-note-button").trigger("click")
+    end
+
+    # has two line forms
+    it { should have_css(".js-temp-notes-holder", count: 2) }
+
+    describe "previewing them separately" do
+      before do
+        # add two separate texts and trigger previews on both
+        within("#4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185.line_holder + .js-temp-notes-holder") do
+          fill_in "note[note]", with: "One comment on line 185"
+          find(".js-note-preview-button").trigger("click")
+        end
+        within("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder + .js-temp-notes-holder") do
+          fill_in "note[note]", with: "Another comment on line 17"
+          find(".js-note-preview-button").trigger("click")
+        end
+      end
+
+      # check if previews were rendered separately
+      it { within("#4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185.line_holder + .js-temp-notes-holder") { should have_css(".js-note-preview", text: "One comment on line 185") } }
+      it { within("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder + .js-temp-notes-holder") { should have_css(".js-note-preview", text: "Another comment on line 17") } }
+    end
+
+    describe "posting a note" do
+      before do
+        within("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder + .js-temp-notes-holder") do
+          fill_in "note[note]", with: "Another comment on line 17"
+          click_button("Add Comment")
+        end
+      end
+
+      # removed form after submit
+      it { should have_no_css("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder + .js-temp-notes-holder") }
+
+      # added discussion
+      it { should have_content("Another comment on line 17") }
+      it { should have_css("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder + .notes_holder") }
+      it { should have_css("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder + .notes_holder .note", count: 1) }
+      it { should have_link("Reply") }
+
+      it "should remove last note of a discussion" do
+        within("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder + .notes_holder") do
+          find(".js-note-delete").trigger("click")
+        end
+
+        # removed whole discussion
+        should_not have_css(".note_holder")
+        should have_css("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder + #342e16cbbd482ac2047dc679b2749d248cc1428f_18_18.line_holder")
+      end
+    end
+  end
+
+  describe "when replying to a note" do
+    before do
+      # create first note
+      find("#4735dfc552ad7bf15ca468adc3cad9d05b624490_184_184.line_holder .js-add-diff-note-button").trigger("click")
+      within("#4735dfc552ad7bf15ca468adc3cad9d05b624490_184_184.line_holder + .js-temp-notes-holder") do
+        fill_in "note[note]", with: "One comment on line 184"
+        click_button("Add Comment")
+      end
+      # create second note
+      within("#4735dfc552ad7bf15ca468adc3cad9d05b624490_184_184.line_holder + .notes_holder") do
+        find(".js-discussion-reply-button").trigger("click")
+        fill_in "note[note]", with: "An additional comment in reply"
+        click_button("Add Comment")
+      end
+    end
+
+    # inserted note
+    it { should have_content("An additional comment in reply") }
+    it { within("#4735dfc552ad7bf15ca468adc3cad9d05b624490_184_184.line_holder + .notes_holder") { should have_css(".note", count: 2) } }
+
+    # removed form after reply
+    it { within("#4735dfc552ad7bf15ca468adc3cad9d05b624490_184_184.line_holder + .notes_holder") { should have_no_css("form") } }
+    it { within("#4735dfc552ad7bf15ca468adc3cad9d05b624490_184_184.line_holder + .notes_holder") { should have_link("Reply") } }
+  end
+end
+
+
+
+describe "On merge request discussion", js: true do
+  describe "with merge request diff note"
+  describe "with commit note"
+  describe "with commit diff note"
+end
@@ -0,0 +1,85 @@
+require 'spec_helper'
+
+describe "On the project wall", js: true do
+  let!(:project) { create(:project) }
+  let!(:commit) { project.repository.commit("bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a") }
+
+  before do
+    login_as :user
+    project.team << [@user, :master]
+    visit wall_project_path(project)
+  end
+
+  subject { page }
+
+  describe "the note form" do
+    # main target form creation
+    it { should have_css(".js-main-target-form", visible: true, count: 1) }
+
+    # button initalization
+    it { within(".js-main-target-form") { should have_button("Add Comment") } }
+    it { within(".js-main-target-form") { should_not have_link("Cancel") } }
+
+    # notifiactions
+    it { within(".js-main-target-form") { should have_checked_field("Notify team via email") } }
+    it { within(".js-main-target-form") { should_not have_checked_field("Notify commit author") } }
+    it { within(".js-main-target-form") { should_not have_unchecked_field("Notify commit author") } }
+
+    describe "without text" do
+      it { within(".js-main-target-form") { should have_css(".js-note-preview-button", visible: false) } }
+    end
+
+    describe "with text" do
+      before do
+        within(".js-main-target-form") do
+          fill_in "note[note]", with: "This is awesome"
+        end
+      end
+
+      it { within(".js-main-target-form") { should_not have_css(".js-comment-button[disabled]") } }
+
+      it { within(".js-main-target-form") { should have_css(".js-note-preview-button", visible: true) } }
+    end
+
+    describe "with preview" do
+      before do
+        within(".js-main-target-form") do
+          fill_in "note[note]", with: "This is awesome"
+          find(".js-note-preview-button").trigger("click")
+        end
+      end
+
+      it { within(".js-main-target-form") { should have_css(".js-note-preview", text: "This is awesome", visible: true) } }
+
+      it { within(".js-main-target-form") { should have_css(".js-note-preview-button", visible: false) } }
+      it { within(".js-main-target-form") { should have_css(".js-note-edit-button", visible: true) } }
+    end
+  end
+
+  describe "when posting a note" do
+    before do
+      within(".js-main-target-form") do
+        fill_in "note[note]", with: "This is awsome!"
+        find(".js-note-preview-button").trigger("click")
+        click_button "Add Comment"
+      end
+    end
+
+    # note added
+    it { within(".js-main-target-form") { should have_content("This is awsome!") } }
+
+    # reset form
+    it { within(".js-main-target-form") { should have_no_field("note[note]", with: "This is awesome!") } }
+
+    # return from preview
+    it { within(".js-main-target-form") { should have_css(".js-note-preview", visible: false) } }
+    it { within(".js-main-target-form") { should have_css(".js-note-text", visible: true) } }
+
+
+    it "should be removable" do
+      find(".js-note-delete").trigger("click")
+
+      should_not have_css(".note")
+    end
+  end
+end
@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe "Profile account page" do
+  let(:user) { create(:user) }
+
+  before do
+    login_as :user
+  end
+
+  describe "when signup is enabled" do
+    before do
+      Gitlab.config.gitlab.stub(:signup_enabled).and_return(true)
+      visit account_profile_path
+    end
+    it { page.should have_content("Remove account") }
+    
+    it "should delete the account", js: true do
+      expect { click_link "Delete account" }.to change {User.count}.by(-1)
+      current_path.should == new_user_session_path
+    end
+  end
+
+  describe "when signup is enabled and user has a project" do
+    before do
+      Gitlab.config.gitlab.stub(:signup_enabled).and_return(true)
+      @project = create(:project, namespace: @user.namespace)
+      @project.team << [@user, :master]
+      visit account_profile_path
+    end
+    it { page.should have_content("Remove account") }
+
+    it "should not allow user to delete the account" do
+      expect { click_link "Delete account" }.not_to change {User.count}.by(-1)
+    end
+  end
+
+  describe "when signup is disabled" do
+    before do
+      Gitlab.config.gitlab.stub(:signup_enabled).and_return(false)
+      visit account_profile_path
+    end
+
+    it "should not have option to remove account" do
+      page.should_not have_content("Remove account")
+      current_path.should == account_profile_path
+    end
+  end
+end
 \ No newline at end of file
@@ -0,0 +1,67 @@
+require 'spec_helper'
+
+describe "Projects", "DeployKeys" do
+  let(:project) { create(:project) }
+
+  before do
+    login_as :user
+    project.team << [@user, :master]
+  end
+
+  describe "GET /keys" do
+    before do
+      @key = create(:key, project: project)
+      visit project_deploy_keys_path(project)
+    end
+
+    subject { page }
+
+    it { should have_content(@key.title) }
+
+    describe "Destroy" do
+      before { visit project_deploy_key_path(project, @key) }
+
+      it "should remove entry" do
+        expect {
+          click_link "Remove"
+        }.to change { project.deploy_keys.count }.by(-1)
+      end
+    end
+  end
+
+  describe "New key" do
+    before do
+      visit project_deploy_keys_path(project)
+      click_link "New Deploy Key"
+    end
+
+    it "should open new key popup" do
+      page.should have_content("New Deploy key")
+    end
+
+    describe "fill in" do
+      before do
+        fill_in "key_title", with: "laptop"
+        fill_in "key_key", with: "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAzrEJUIR6Y03TCE9rIJ+GqTBvgb8t1jI9h5UBzCLuK4VawOmkLornPqLDrGbm6tcwM/wBrrLvVOqi2HwmkKEIecVO0a64A4rIYScVsXIniHRS6w5twyn1MD3sIbN+socBDcaldECQa2u1dI3tnNVcs8wi77fiRe7RSxePsJceGoheRQgC8AZ510UdIlO+9rjIHUdVN7LLyz512auAfYsgx1OfablkQ/XJcdEwDNgi9imI6nAXhmoKUm1IPLT2yKajTIC64AjLOnE0YyCh6+7RFMpiMyu1qiOCpdjYwTgBRiciNRZCH8xIedyCoAmiUgkUT40XYHwLuwiPJICpkAzp7Q== user@laptop"
+      end
+
+      it { expect { click_button "Save" }.to change {Key.count}.by(1) }
+
+      it "should add new key to table" do
+        click_button "Save"
+
+        page.should have_content "laptop"
+      end
+    end
+  end
+
+  describe "Show page" do
+    before do
+      @key = create(:key, project: project)
+      visit project_deploy_key_path(project, @key)
+    end
+
+    it { page.should have_content @key.title }
+    it { page.should have_content @key.key[0..10] }
+  end
+end
@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe "Projects" do
+  before { login_as :user }
+
+  describe "DELETE /projects/:id" do
+    before do
+      @project = create(:project, namespace: @user.namespace)
+      @project.team << [@user, :master]
+      visit edit_project_path(@project)
+    end
+
+    it "should be correct path" do
+      expect { click_link "Remove" }.to change {Project.count}.by(-1)
+    end
+  end
+end
@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe "Search" do
+  before do
+    login_as :user
+    @project = create(:project)
+    @project.team << [@user, :reporter]
+    visit search_path
+    fill_in "search", with: @project.name[0..3]
+    click_button "Search"
+  end
+
+  it "should show project in search results" do
+    page.should have_content @project.name
+  end
+end
+
@@ -0,0 +1,49 @@
+require 'spec_helper'
+
+describe "Users Security" do
+  describe "Project" do
+    before do
+      @u1 = create(:user)
+    end
+
+    describe "GET /login" do
+      it { new_user_session_path.should_not be_404_for :visitor }
+    end
+
+    describe "GET /keys" do
+      subject { keys_path }
+
+      it { should be_allowed_for @u1 }
+      it { should be_allowed_for :admin }
+      it { should be_allowed_for :user }
+      it { should be_denied_for :visitor }
+    end
+
+    describe "GET /profile" do
+      subject { profile_path }
+
+      it { should be_allowed_for @u1 }
+      it { should be_allowed_for :admin }
+      it { should be_allowed_for :user }
+      it { should be_denied_for :visitor }
+    end
+
+    describe "GET /profile/account" do
+      subject { account_profile_path }
+
+      it { should be_allowed_for @u1 }
+      it { should be_allowed_for :admin }
+      it { should be_allowed_for :user }
+      it { should be_denied_for :visitor }
+    end
+
+    describe "GET /profile/design" do
+      subject { design_profile_path }
+
+      it { should be_allowed_for @u1 }
+      it { should be_allowed_for :admin }
+      it { should be_allowed_for :user }
+      it { should be_denied_for :visitor }
+    end
+  end
+end
@@ -0,0 +1,243 @@
+require 'spec_helper'
+
+describe "Application access" do
+  describe "GET /" do
+    it { root_path.should be_allowed_for :admin }
+    it { root_path.should be_allowed_for :user }
+    it { root_path.should be_denied_for :visitor }
+  end
+
+  describe "GET /projects/new" do
+    it { new_project_path.should be_allowed_for :admin }
+    it { new_project_path.should be_allowed_for :user }
+    it { new_project_path.should be_denied_for :visitor }
+  end
+
+  describe "Project" do
+    let(:project)  { create(:project) }
+
+    let(:master)   { create(:user) }
+    let(:guest)    { create(:user) }
+    let(:reporter) { create(:user) }
+
+    before do
+      # full access
+      project.team << [master, :master]
+
+      # readonly
+      project.team << [reporter, :reporter]
+    end
+
+    describe "GET /project_code" do
+      subject { project_path(project) }
+
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
+      it { should be_denied_for :admin }
+      it { should be_denied_for guest }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/tree/master" do
+      subject { project_tree_path(project, project.repository.root_ref) }
+
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
+      it { should be_denied_for :admin }
+      it { should be_denied_for guest }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/commits/master" do
+      subject { project_commits_path(project, project.repository.root_ref, limit: 1) }
+
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
+      it { should be_denied_for :admin }
+      it { should be_denied_for guest }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/commit/:sha" do
+      subject { project_commit_path(project, project.repository.commit) }
+
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
+      it { should be_denied_for :admin }
+      it { should be_denied_for guest }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/compare" do
+      subject { project_compare_index_path(project) }
+
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
+      it { should be_denied_for :admin }
+      it { should be_denied_for guest }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/team" do
+      subject { project_team_index_path(project) }
+
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
+      it { should be_denied_for :admin }
+      it { should be_denied_for guest }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/wall" do
+      subject { wall_project_path(project) }
+
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
+      it { should be_denied_for :admin }
+      it { should be_denied_for guest }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/blob" do
+      before do
+        commit = project.repository.commit
+        path = commit.tree.contents.select { |i| i.is_a?(Grit::Blob)}.first.name
+        @blob_path = project_blob_path(project, File.join(commit.id, path))
+      end
+
+      it { @blob_path.should be_allowed_for master }
+      it { @blob_path.should be_allowed_for reporter }
+      it { @blob_path.should be_denied_for :admin }
+      it { @blob_path.should be_denied_for guest }
+      it { @blob_path.should be_denied_for :user }
+      it { @blob_path.should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/edit" do
+      subject { edit_project_path(project) }
+
+      it { should be_allowed_for master }
+      it { should be_denied_for reporter }
+      it { should be_denied_for :admin }
+      it { should be_denied_for guest }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/deploy_keys" do
+      subject { project_deploy_keys_path(project) }
+
+      it { should be_allowed_for master }
+      it { should be_denied_for reporter }
+      it { should be_denied_for :admin }
+      it { should be_denied_for guest }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/issues" do
+      subject { project_issues_path(project) }
+
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
+      it { should be_denied_for :admin }
+      it { should be_denied_for guest }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/snippets" do
+      subject { project_snippets_path(project) }
+
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
+      it { should be_denied_for :admin }
+      it { should be_denied_for guest }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/merge_requests" do
+      subject { project_merge_requests_path(project) }
+
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
+      it { should be_denied_for :admin }
+      it { should be_denied_for guest }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/repository" do
+      subject { project_repository_path(project) }
+
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
+      it { should be_denied_for :admin }
+      it { should be_denied_for guest }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/repository/branches" do
+      subject { branches_project_repository_path(project) }
+
+      before do
+        # Speed increase
+        Project.any_instance.stub(:branches).and_return([])
+      end
+
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
+      it { should be_denied_for :admin }
+      it { should be_denied_for guest }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/repository/tags" do
+      subject { tags_project_repository_path(project) }
+
+      before do
+        # Speed increase
+        Project.any_instance.stub(:tags).and_return([])
+      end
+
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
+      it { should be_denied_for :admin }
+      it { should be_denied_for guest }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/hooks" do
+      subject { project_hooks_path(project) }
+
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
+      it { should be_denied_for :admin }
+      it { should be_denied_for guest }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
+    end
+
+    describe "GET /project_code/files" do
+      subject { files_project_path(project) }
+
+      it { should be_allowed_for master }
+      it { should be_allowed_for reporter }
+      it { should be_denied_for :admin }
+      it { should be_denied_for guest }
+      it { should be_denied_for :user }
+      it { should be_denied_for :visitor }
+    end
+  end
+end
@@ -0,0 +1,99 @@
+require 'spec_helper'
+
+describe "Snippets" do
+  let(:project) { create(:project) }
+
+  before do
+    login_as :user
+    project.team << [@user, :developer]
+  end
+
+  describe "GET /snippets" do
+    before do
+      @snippet = create(:snippet,
+                        author: @user,
+                        project: project)
+
+      visit project_snippets_path(project)
+    end
+
+    subject { page }
+
+    it { should have_content(@snippet.title[0..10]) }
+    it { should have_content(@snippet.project.name) }
+
+    describe "Destroy" do
+      before do
+        # admin access to remove snippet
+        @user.users_projects.destroy_all
+        project.team << [@user, :master]
+        visit edit_project_snippet_path(project, @snippet)
+      end
+
+      it "should remove entry" do
+        expect {
+          click_link "destroy_snippet_#{@snippet.id}"
+        }.to change { Snippet.count }.by(-1)
+      end
+    end
+  end
+
+  describe "New snippet" do
+    before do
+      visit project_snippets_path(project)
+      click_link "New Snippet"
+    end
+
+    it "should open new snippet popup" do
+      page.current_path.should == new_project_snippet_path(project)
+    end
+
+    describe "fill in", js: true do
+      before do
+        fill_in "snippet_title", with: "login function"
+        fill_in "snippet_file_name", with: "test.rb"
+        page.execute_script("editor.insert('def login; end');")
+      end
+
+      it { expect { click_button "Save" }.to change {Snippet.count}.by(1) }
+
+      it "should add new snippet to table" do
+        click_button "Save"
+        page.current_path.should == project_snippet_path(project, Snippet.last)
+        page.should have_content "login function"
+        page.should have_content "test.rb"
+      end
+    end
+  end
+
+  describe "Edit snippet" do
+    before do
+      @snippet = create(:snippet,
+                        author: @user,
+                        project: project)
+      visit project_snippet_path(project, @snippet)
+      click_link "Edit"
+    end
+
+    it "should open edit page" do
+      page.current_path.should == edit_project_snippet_path(project, @snippet)
+    end
+
+    describe "fill in" do
+      before do
+        fill_in "snippet_title", with: "login function"
+        fill_in "snippet_file_name", with: "test.rb"
+      end
+
+      it { expect { click_button "Save" }.to_not change {Snippet.count} }
+
+      it "should update snippet fields" do
+        click_button "Save"
+
+        page.current_path.should == project_snippet_path(project, @snippet)
+        page.should have_content "login function"
+        page.should have_content "test.rb"
+      end
+    end
+  end
+end
@@ -1,51 +0,0 @@
-require 'spec_helper'
-
-describe "Admin::Hooks" do
-  before do
-    @project = create(:project)
-    login_as :admin
-
-    @system_hook = create(:system_hook)
-
-  end
-
-  describe "GET /admin/hooks" do
-    it "should be ok" do
-      visit admin_root_path
-      within ".main_menu" do
-        click_on "Hooks"
-      end
-      current_path.should == admin_hooks_path
-    end
-
-    it "should have hooks list" do
-      visit admin_hooks_path
-      page.should have_content(@system_hook.url)
-    end
-  end
-
-  describe "New Hook" do
-    before do
-      @url = Faker::Internet.uri("http")
-      visit admin_hooks_path
-      fill_in "hook_url", with: @url
-      expect { click_button "Add System Hook" }.to change(SystemHook, :count).by(1)
-    end
-
-    it "should open new hook popup" do
-      page.current_path.should == admin_hooks_path
-      page.should have_content(@url)
-    end
-  end
-
-  describe "Test" do
-    before do
-      WebMock.stub_request(:post, @system_hook.url)
-      visit admin_hooks_path
-      click_link "Test Hook"
-    end
-
-    it { page.current_path.should == admin_hooks_path }
-  end
-
-end
@@ -1,76 +0,0 @@
-require 'spec_helper'
-
-describe "Admin::Projects" do
-  before do
-    @project = create(:project)
-    login_as :admin
-  end
-
-  describe "GET /admin/projects" do
-    before do
-      visit admin_projects_path
-    end
-
-    it "should be ok" do
-      current_path.should == admin_projects_path
-    end
-
-    it "should have projects list" do
-      page.should have_content(@project.name)
-    end
-  end
-
-  describe "GET /admin/projects/:id" do
-    before do
-      visit admin_projects_path
-      click_link "#{@project.name}"
-    end
-
-    it "should have project info" do
-      page.should have_content(@project.path)
-      page.should have_content(@project.name)
-    end
-  end
-
-  describe "GET /admin/projects/:id/edit" do
-    before do
-      visit admin_projects_path
-      click_link "edit_project_#{@project.id}"
-    end
-
-    it "should have project edit page" do
-      page.should have_content("Edit project")
-      page.should have_button("Save Project")
-    end
-
-    describe "Update project" do
-      before do
-        fill_in "project_name", with: "Big Bang"
-        click_button "Save Project"
-        @project.reload
-      end
-
-      it "should show page with  new data" do
-        page.should have_content("Big Bang")
-      end
-
-      it "should change project entry" do
-        @project.name.should == "Big Bang"
-      end
-    end
-  end
-
-  describe "Add new team member" do
-    before do
-      @new_user = create(:user)
-      visit admin_project_path(@project)
-    end
-
-    it "should create new user" do
-      select @new_user.name, from: "user_ids"
-      expect { click_button "Add" }.to change { UsersProject.count }.by(1)
-      page.should have_content @new_user.name
-      current_path.should == admin_project_path(@project)
-    end
-  end
-end
@@ -1,135 +0,0 @@
-require 'spec_helper'
-
-describe "Admin::Users" do
-  before { login_as :admin }
-
-  describe "GET /admin/users" do
-    before do
-      visit admin_users_path
-    end
-
-    it "should be ok" do
-      current_path.should == admin_users_path
-    end
-
-    it "should have users list" do
-      page.should have_content(@user.email)
-      page.should have_content(@user.name)
-    end
-  end
-
-  describe "GET /admin/users/new" do
-    before do
-      @password = "123ABC"
-      visit new_admin_user_path
-      fill_in "user_name", with: "Big Bang"
-      fill_in "user_username", with: "bang"
-      fill_in "user_email", with: "bigbang@mail.com"
-      fill_in "user_password", with: @password
-      fill_in "user_password_confirmation", with: @password
-    end
-
-    it "should create new user" do
-      expect { click_button "Save" }.to change {User.count}.by(1)
-    end
-
-    it "should create user with valid data" do
-      click_button "Save"
-      user = User.last
-      user.name.should ==  "Big Bang"
-      user.email.should == "bigbang@mail.com"
-    end
-
-    it "should call send mail" do
-      Notify.should_receive(:new_user_email)
-
-      User.observers.enable :user_observer do
-        click_button "Save"
-      end
-    end
-
-    it "should send valid email to user with email & password" do
-      Gitlab.config.gitlab.stub(:signup_enabled).and_return(false)
-      User.observers.enable :user_observer do
-        click_button "Save"
-        user = User.last
-        email = ActionMailer::Base.deliveries.last
-        email.subject.should have_content("Account was created")
-        email.body.should have_content(user.email)
-        email.body.should have_content(@password)
-      end
-    end
-
-    it "should send valid email to user with email without password when signup is enabled" do
-      Gitlab.config.gitlab.stub(:signup_enabled).and_return(true)
-      User.observers.enable :user_observer do
-        click_button "Save"
-        user = User.last
-        email = ActionMailer::Base.deliveries.last
-        email.subject.should have_content("Account was created")
-        email.body.should have_content(user.email)
-        email.body.should_not have_content(@password)
-      end
-    end
-  end
-
-  describe "GET /admin/users/:id" do
-    before do
-      visit admin_users_path
-      click_link "#{@user.name}"
-    end
-
-    it "should have user info" do
-      page.should have_content(@user.email)
-      page.should have_content(@user.name)
-      page.should have_content(@user.projects_limit)
-    end
-  end
-
-  describe "GET /admin/users/:id/edit" do
-    before do
-      @simple_user = create(:user)
-      visit admin_users_path
-      click_link "edit_user_#{@simple_user.id}"
-    end
-
-    it "should have user edit page" do
-      page.should have_content("Name")
-      page.should have_content("Password")
-    end
-
-    describe "Update user" do
-      before do
-        fill_in "user_name", with: "Big Bang"
-        fill_in "user_email", with: "bigbang@mail.com"
-        check "user_admin"
-        click_button "Save"
-      end
-
-      it "should show page with  new data" do
-        page.should have_content("bigbang@mail.com")
-        page.should have_content("Big Bang")
-      end
-
-      it "should change user entry" do
-        @simple_user.reload
-        @simple_user.name.should == "Big Bang"
-        @simple_user.is_admin?.should be_true
-      end
-    end
-  end
-
-  describe "Add new project" do
-    before do
-      @new_project = create(:project)
-      visit admin_user_path(@user)
-    end
-
-    it "should create new user" do
-      select @new_project.name, from: "project_ids"
-      expect { click_button "Add" }.to change { UsersProject.count }.by(1)
-      page.should have_content @new_project.name
-      current_path.should == admin_user_path(@user)
-    end
-  end
-end
@@ -1,27 +0,0 @@
-require 'spec_helper'
-
-describe "Admin::Projects" do
-  describe "GET /admin/projects" do
-    subject { admin_projects_path }
-
-    it { should be_allowed_for :admin }
-    it { should be_denied_for :user }
-    it { should be_denied_for :visitor }
-  end
-
-  describe "GET /admin/users" do
-    subject { admin_users_path }
-
-    it { should be_allowed_for :admin }
-    it { should be_denied_for :user }
-    it { should be_denied_for :visitor }
-  end
-
-  describe "GET /admin/hooks" do
-    subject { admin_hooks_path }
-
-    it { should be_allowed_for :admin }
-    it { should be_denied_for :user }
-    it { should be_denied_for :visitor }
-  end
-end
@@ -1,24 +0,0 @@
-require 'spec_helper'
-
-describe "Dashboard Issues Feed" do
-  describe "GET /issues" do
-    let!(:user)     { create(:user) }
-    let!(:project1) { create(:project) }
-    let!(:project2) { create(:project) }
-    let!(:issue1)   { create(:issue, author: user, assignee: user, project: project1) }
-    let!(:issue2)   { create(:issue, author: user, assignee: user, project: project2) }
-
-    describe "atom feed" do
-      it "should render atom feed via private token" do
-        visit issues_dashboard_path(:atom, private_token: user.private_token)
-
-        page.response_headers['Content-Type'].should have_content("application/atom+xml")
-        page.body.should have_selector("title", text: "#{user.name} issues")
-        page.body.should have_selector("author email", text: issue1.author_email)
-        page.body.should have_selector("entry summary", text: issue1.title)
-        page.body.should have_selector("author email", text: issue2.author_email)
-        page.body.should have_selector("entry summary", text: issue2.title)
-      end
-    end
-  end
-end
@@ -1,14 +0,0 @@
-require 'spec_helper'
-
-describe "Dashboard Feed" do
-  describe "GET /" do
-    let!(:user) { create(:user) }
-
-    context "projects atom feed via private token" do
-      it "should render projects atom feed" do
-        visit dashboard_path(:atom, private_token: user.private_token)
-        page.body.should have_selector("feed title")
-      end
-    end
-  end
-end
@@ -1,34 +0,0 @@
-require 'spec_helper'
-
-describe "Issues Feed" do
-  describe "GET /issues" do
-    let!(:user)     { create(:user) }
-    let!(:project)  { create(:project, namespace: user.namespace) }
-    let!(:issue)    { create(:issue, author: user, project: project) }
-
-    before { project.team << [user, :developer] }
-
-    context "when authenticated" do
-      it "should render atom feed" do
-        login_with user
-        visit project_issues_path(project, :atom)
-
-        page.response_headers['Content-Type'].should have_content("application/atom+xml")
-        page.body.should have_selector("title", text: "#{project.name} issues")
-        page.body.should have_selector("author email", text: issue.author_email)
-        page.body.should have_selector("entry summary", text: issue.title)
-      end
-    end
-
-    context "when authenticated via private token" do
-      it "should render atom feed" do
-        visit project_issues_path(project, :atom, private_token: user.private_token)
-
-        page.response_headers['Content-Type'].should have_content("application/atom+xml")
-        page.body.should have_selector("title", text: "#{project.name} issues")
-        page.body.should have_selector("author email", text: issue.author_email)
-        page.body.should have_selector("entry summary", text: issue.title)
-      end
-    end
-  end
-end
@@ -1,223 +0,0 @@
-require 'spec_helper'
-
-describe "Gitlab Flavored Markdown" do
-  let(:project) { create(:project) }
-  let(:issue) { create(:issue, project: project) }
-  let(:merge_request) { create(:merge_request, project: project) }
-  let(:fred) do
-      u = create(:user, name: "fred")
-      project.team << [u, :master]
-      u
-  end
-
-  before do
-    # add test branch
-    @branch_name = "gfm-test"
-    r = project.repo
-    i = r.index
-    # add test file
-    @test_file = "gfm_test_file"
-    i.add(@test_file, "foo\nbar\n")
-    # add commit with gfm
-    i.commit("fix ##{issue.id}\n\nask @#{fred.username} for details", head: @branch_name)
-
-    # add test tag
-    @tag_name = "gfm-test-tag"
-    r.git.native(:tag, {}, @tag_name, commit.id)
-  end
-
-  after do
-    # delete test branch and tag
-    project.repo.git.native(:branch, {D: true}, @branch_name)
-    project.repo.git.native(:tag, {d: true}, @tag_name)
-    project.repo.gc_auto
-  end
-
-  let(:commit) { project.repository.commits(@branch_name).first }
-
-  before do
-    login_as :user
-    project.team << [@user, :developer]
-  end
-
-  describe "for commits" do
-    it "should render title in commits#index" do
-      visit project_commits_path(project, @branch_name, limit: 1)
-
-      page.should have_link("##{issue.id}")
-    end
-
-    it "should render title in commits#show" do
-      visit project_commit_path(project, commit)
-
-      page.should have_link("##{issue.id}")
-    end
-
-    it "should render description in commits#show" do
-      visit project_commit_path(project, commit)
-
-      page.should have_link("@#{fred.username}")
-    end
-
-    it "should render title in refs#tree", js: true do
-      visit project_tree_path(project, @branch_name)
-
-      within(".tree_commit") do
-        page.should have_link("##{issue.id}")
-      end
-    end
-
-    # @wip
-    #it "should render title in refs#blame" do
-      #visit project_blame_path(project, File.join(@branch_name, @test_file))
-
-      #within(".blame_commit") do
-        #page.should have_link("##{issue.id}")
-      #end
-    #end
-
-    it "should render title in repositories#branches" do
-      visit branches_project_repository_path(project)
-
-      page.should have_link("##{issue.id}")
-    end
-  end
-
-  describe "for issues" do
-    before do
-      @other_issue = create(:issue,
-                            author: @user,
-                            assignee: @user,
-                            project: project)
-      @issue = create(:issue,
-                      author: @user,
-                      assignee: @user,
-                      project: project,
-                      title: "fix ##{@other_issue.id}",
-                      description: "ask @#{fred.username} for details")
-    end
-
-    it "should render subject in issues#index" do
-      visit project_issues_path(project)
-
-      page.should have_link("##{@other_issue.id}")
-    end
-
-    it "should render subject in issues#show" do
-      visit project_issue_path(project, @issue)
-
-      page.should have_link("##{@other_issue.id}")
-    end
-
-    it "should render details in issues#show" do
-      visit project_issue_path(project, @issue)
-
-      page.should have_link("@#{fred.username}")
-    end
-  end
-
-
-  describe "for merge requests" do
-    before do
-      @merge_request = create(:merge_request,
-                              project: project,
-                              title: "fix ##{issue.id}")
-    end
-
-    it "should render title in merge_requests#index" do
-      visit project_merge_requests_path(project)
-
-      page.should have_link("##{issue.id}")
-    end
-
-    it "should render title in merge_requests#show" do
-      visit project_merge_request_path(project, @merge_request)
-
-      page.should have_link("##{issue.id}")
-    end
-  end
-
-
-  describe "for milestones" do
-    before do
-      @milestone = create(:milestone,
-                          project: project,
-                          title: "fix ##{issue.id}",
-                          description: "ask @#{fred.username} for details")
-    end
-
-    it "should render title in milestones#index" do
-      visit project_milestones_path(project)
-
-      page.should have_link("##{issue.id}")
-    end
-
-    it "should render title in milestones#show" do
-      visit project_milestone_path(project, @milestone)
-
-      page.should have_link("##{issue.id}")
-    end
-
-    it "should render description in milestones#show" do
-      visit project_milestone_path(project, @milestone)
-
-      page.should have_link("@#{fred.username}")
-    end
-  end
-
-
-  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"
-
-      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"
-
-      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"
-
-      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"
-
-      page.should have_link("##{issue.id}")
-    end
-  end
-
-
-  describe "for wikis" do
-    before do
-      visit project_wiki_path(project, :index)
-      fill_in "Title", with: "Circumvent ##{issue.id}"
-      fill_in "Content", with: "# Other pages\n\n* [Foo](foo)\n* [Bar](bar)\n\nAlso look at ##{issue.id} :-)"
-      click_on "Save"
-    end
-
-    it "should NOT render title in wikis#show" do
-      within(".content h3") do # page title
-        page.should have_content("Circumvent ##{issue.id}")
-        page.should_not have_link("##{issue.id}")
-      end
-    end
-
-    it "should render content in wikis#show" do
-      page.should have_link("##{issue.id}")
-    end
-  end
-end
@@ -1,132 +0,0 @@
-require 'spec_helper'
-
-describe "Issues" do
-  let(:project) { create(:project) }
-
-  before do
-    login_as :user
-    user2 = create(:user)
-
-    project.team << [[@user, user2], :developer]
-  end
-
-  describe "Edit issue" do
-    let!(:issue) do
-      create(:issue,
-             author: @user,
-             assignee: @user,
-             project: project)
-    end
-
-    before do
-      visit project_issues_path(project)
-      click_link "Edit"
-    end
-
-    it "should open new issue popup" do
-      page.should have_content("Issue ##{issue.id}")
-    end
-
-    describe "fill in" do
-      before do
-        fill_in "issue_title", with: "bug 345"
-        fill_in "issue_description", with: "bug description"
-      end
-
-      it { expect { click_button "Save changes" }.to_not change {Issue.count} }
-
-      it "should update issue fields" do
-        click_button "Save changes"
-
-        page.should have_content @user.name
-        page.should have_content "bug 345"
-        page.should have_content project.name
-      end
-    end
-  end
-
-  describe "Search issue", js: true do
-    before do
-      ['foobar', 'foobar2', 'gitlab'].each do |title|
-        create(:issue,
-               author: @user,
-               assignee: @user,
-               project: project,
-               title: title)
-      end
-    end
-
-    it "should be able to search on different statuses" do
-      issue = Issue.first # with title 'foobar'
-      issue.close
-
-      visit project_issues_path(project)
-      click_link 'Closed'
-      fill_in 'issue_search', with: 'foobar'
-
-      page.should have_content 'foobar'
-      page.should_not have_content 'foobar2'
-      page.should_not have_content 'gitlab'
-    end
-
-    it "should search for term and return the correct results" do
-      visit project_issues_path(project)
-      fill_in 'issue_search', with: 'foobar'
-
-      page.should have_content 'foobar'
-      page.should have_content 'foobar2'
-      page.should_not have_content 'gitlab'
-    end
-  end
-
-  describe "Filter issue" do
-    before do
-      ['foobar', 'barbaz', 'gitlab'].each do |title|
-        create(:issue,
-               author: @user,
-               assignee: @user,
-               project: project,
-               title: title)
-      end
-
-      @issue = Issue.first # with title 'foobar'
-      @issue.milestone = create(:milestone, project: project)
-      @issue.assignee = nil
-      @issue.save
-    end
-
-    let(:issue) { @issue }
-
-    it "should allow filtering by issues with no specified milestone" do
-      visit project_issues_path(project, milestone_id: '0')
-
-      page.should_not have_content 'foobar'
-      page.should have_content 'barbaz'
-      page.should have_content 'gitlab'
-    end
-
-    it "should allow filtering by a specified milestone" do
-      visit project_issues_path(project, milestone_id: issue.milestone.id)
-
-      page.should have_content 'foobar'
-      page.should_not have_content 'barbaz'
-      page.should_not have_content 'gitlab'
-    end
-
-    it "should allow filtering by issues with no specified assignee" do
-      visit project_issues_path(project, assignee_id: '0')
-
-      page.should have_content 'foobar'
-      page.should_not have_content 'barbaz'
-      page.should_not have_content 'gitlab'
-    end
-
-    it "should allow filtering by a specified assignee" do
-      visit project_issues_path(project, assignee_id: @user.id)
-
-      page.should_not have_content 'foobar'
-      page.should have_content 'barbaz'
-      page.should have_content 'gitlab'
-    end
-  end
-end
@@ -1,232 +0,0 @@
-require 'spec_helper'
-
-describe "On a merge request", js: true do
-  let!(:project) { create(:project) }
-  let!(:merge_request) { create(:merge_request, project: project) }
-
-  before do
-    login_as :user
-    project.team << [@user, :master]
-
-    visit project_merge_request_path(project, merge_request)
-  end
-
-  subject { page }
-
-  describe "the note form" do
-    # main target form creation
-    it { should have_css(".js-main-target-form", visible: true, count: 1) }
-
-    # button initalization
-    it { within(".js-main-target-form") { should have_button("Add Comment") } }
-    it { within(".js-main-target-form") { should_not have_link("Cancel") } }
-
-    # notifiactions
-    it { within(".js-main-target-form") { should have_checked_field("Notify team via email") } }
-    it { within(".js-main-target-form") { should_not have_checked_field("Notify commit author") } }
-    it { within(".js-main-target-form") { should_not have_unchecked_field("Notify commit author") } }
-
-    describe "without text" do
-      it { within(".js-main-target-form") { should have_css(".js-note-preview-button", visible: false) } }
-    end
-
-    describe "with text" do
-      before do
-        within(".js-main-target-form") do
-          fill_in "note[note]", with: "This is awesome"
-        end
-      end
-
-      it { within(".js-main-target-form") { should_not have_css(".js-comment-button[disabled]") } }
-
-      it { within(".js-main-target-form") { should have_css(".js-note-preview-button", visible: true) } }
-    end
-
-    describe "with preview" do
-      before do
-        within(".js-main-target-form") do
-          fill_in "note[note]", with: "This is awesome"
-          find(".js-note-preview-button").trigger("click")
-        end
-      end
-
-      it { within(".js-main-target-form") { should have_css(".js-note-preview", text: "This is awesome", visible: true) } }
-
-      it { within(".js-main-target-form") { should have_css(".js-note-preview-button", visible: false) } }
-      it { within(".js-main-target-form") { should have_css(".js-note-edit-button", visible: true) } }
-    end
-  end
-
-  describe "when posting a note" do
-    before do
-      within(".js-main-target-form") do
-        fill_in "note[note]", with: "This is awsome!"
-        find(".js-note-preview-button").trigger("click")
-        click_button "Add Comment"
-      end
-    end
-
-    # note added
-    it { within(".js-main-target-form") { should have_content("This is awsome!") } }
-
-    # reset form
-    it { within(".js-main-target-form") { should have_no_field("note[note]", with: "This is awesome!")  } }
-
-    # return from preview
-    it { within(".js-main-target-form") { should have_css(".js-note-preview", visible: false) } }
-    it { within(".js-main-target-form") { should have_css(".js-note-text", visible: true) } }
-
-
-    it "should be removable" do
-      find(".js-note-delete").trigger("click")
-
-      should_not have_css(".note")
-    end
-  end
-end
-
-
-
-describe "On a merge request diff", js: true, focus: true do
-  let!(:project) { create(:project) }
-  let!(:merge_request) { create(:merge_request_with_diffs, project: project) }
-
-  before do
-    login_as :user
-    project.team << [@user, :master]
-
-    visit diffs_project_merge_request_path(project, merge_request)
-
-    click_link("Diff")
-  end
-
-  subject { page }
-
-  describe "when adding a note" do
-    before do
-      find("#4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185.line_holder .js-add-diff-note-button").trigger("click")
-    end
-
-    describe "the notes holder" do
-      it { should have_css("#4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185.line_holder + .js-temp-notes-holder") }
-
-      it { within(".js-temp-notes-holder") { should have_css(".new_note") } }
-    end
-
-    describe "the note form" do
-      # set up hidden fields correctly
-      it { within(".js-temp-notes-holder") { find("#note_noteable_type").value.should == "MergeRequest" } }
-      it { within(".js-temp-notes-holder") { find("#note_noteable_id").value.should == merge_request.id.to_s } }
-      it { within(".js-temp-notes-holder") { find("#note_commit_id").value.should == "" } }
-      it { within(".js-temp-notes-holder") { find("#note_line_code").value.should == "4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185" } }
-
-      # buttons
-      it { should have_button("Add Comment") }
-      it { should have_css(".js-close-discussion-note-form", text: "Cancel") }
-
-      # notification options
-      it { should have_checked_field("Notify team via email") }
-
-      it "shouldn't add a second form for same row" do
-        find("#4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185.line_holder .js-add-diff-note-button").trigger("click")
-
-        should have_css("#4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185.line_holder + .js-temp-notes-holder form", count: 1)
-      end
-
-      it "should be removed when canceled" do
-        find(".js-close-discussion-note-form").trigger("click")
-
-        should have_no_css(".js-temp-notes-holder")
-      end
-    end
-  end
-
-  describe "with muliple note forms" do
-    before do
-      find("#4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185.line_holder .js-add-diff-note-button").trigger("click")
-      find("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder .js-add-diff-note-button").trigger("click")
-    end
-
-    # has two line forms
-    it { should have_css(".js-temp-notes-holder", count: 2) }
-
-    describe "previewing them separately" do
-      before do
-        # add two separate texts and trigger previews on both
-        within("#4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185.line_holder + .js-temp-notes-holder") do
-          fill_in "note[note]", with: "One comment on line 185"
-          find(".js-note-preview-button").trigger("click")
-        end
-        within("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder + .js-temp-notes-holder") do
-          fill_in "note[note]", with: "Another comment on line 17"
-          find(".js-note-preview-button").trigger("click")
-        end
-      end
-
-      # check if previews were rendered separately
-      it { within("#4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185.line_holder + .js-temp-notes-holder") { should have_css(".js-note-preview", text: "One comment on line 185") } }
-      it { within("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder + .js-temp-notes-holder") { should have_css(".js-note-preview", text: "Another comment on line 17") } }
-    end
-
-    describe "posting a note" do
-      before do
-        within("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder + .js-temp-notes-holder") do
-          fill_in "note[note]", with: "Another comment on line 17"
-          click_button("Add Comment")
-        end
-      end
-
-      # removed form after submit
-      it { should have_no_css("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder + .js-temp-notes-holder") }
-
-      # added discussion
-      it { should have_content("Another comment on line 17") }
-      it { should have_css("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder + .notes_holder") }
-      it { should have_css("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder + .notes_holder .note", count: 1) }
-      it { should have_link("Reply") }
-
-      it "should remove last note of a discussion" do
-        within("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder + .notes_holder") do
-          find(".js-note-delete").trigger("click")
-        end
-
-        # removed whole discussion
-        should_not have_css(".note_holder")
-        should have_css("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder + #342e16cbbd482ac2047dc679b2749d248cc1428f_18_18.line_holder")
-      end
-    end
-  end
-
-  describe "when replying to a note" do
-    before do
-      # create first note
-      find("#4735dfc552ad7bf15ca468adc3cad9d05b624490_184_184.line_holder .js-add-diff-note-button").trigger("click")
-      within("#4735dfc552ad7bf15ca468adc3cad9d05b624490_184_184.line_holder + .js-temp-notes-holder") do
-        fill_in "note[note]", with: "One comment on line 184"
-        click_button("Add Comment")
-      end
-      # create second note
-      within("#4735dfc552ad7bf15ca468adc3cad9d05b624490_184_184.line_holder + .notes_holder") do
-        find(".js-discussion-reply-button").trigger("click")
-        fill_in "note[note]", with: "An additional comment in reply"
-        click_button("Add Comment")
-      end
-    end
-
-    # inserted note
-    it { should have_content("An additional comment in reply") }
-    it { within("#4735dfc552ad7bf15ca468adc3cad9d05b624490_184_184.line_holder + .notes_holder") { should have_css(".note", count: 2) } }
-
-    # removed form after reply
-    it { within("#4735dfc552ad7bf15ca468adc3cad9d05b624490_184_184.line_holder + .notes_holder") { should have_no_css("form") } }
-    it { within("#4735dfc552ad7bf15ca468adc3cad9d05b624490_184_184.line_holder + .notes_holder") { should have_link("Reply") } }
-  end
-end
-
-
-
-describe "On merge request discussion", js: true do
-  describe "with merge request diff note"
-  describe "with commit note"
-  describe "with commit diff note"
-end
@@ -1,85 +0,0 @@
-require 'spec_helper'
-
-describe "On the project wall", js: true do
-  let!(:project) { create(:project) }
-  let!(:commit) { project.repository.commit("bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a") }
-
-  before do
-    login_as :user
-    project.team << [@user, :master]
-    visit wall_project_path(project)
-  end
-
-  subject { page }
-
-  describe "the note form" do
-    # main target form creation
-    it { should have_css(".js-main-target-form", visible: true, count: 1) }
-
-    # button initalization
-    it { within(".js-main-target-form") { should have_button("Add Comment") } }
-    it { within(".js-main-target-form") { should_not have_link("Cancel") } }
-
-    # notifiactions
-    it { within(".js-main-target-form") { should have_checked_field("Notify team via email") } }
-    it { within(".js-main-target-form") { should_not have_checked_field("Notify commit author") } }
-    it { within(".js-main-target-form") { should_not have_unchecked_field("Notify commit author") } }
-
-    describe "without text" do
-      it { within(".js-main-target-form") { should have_css(".js-note-preview-button", visible: false) } }
-    end
-
-    describe "with text" do
-      before do
-        within(".js-main-target-form") do
-          fill_in "note[note]", with: "This is awesome"
-        end
-      end
-
-      it { within(".js-main-target-form") { should_not have_css(".js-comment-button[disabled]") } }
-
-      it { within(".js-main-target-form") { should have_css(".js-note-preview-button", visible: true) } }
-    end
-
-    describe "with preview" do
-      before do
-        within(".js-main-target-form") do
-          fill_in "note[note]", with: "This is awesome"
-          find(".js-note-preview-button").trigger("click")
-        end
-      end
-
-      it { within(".js-main-target-form") { should have_css(".js-note-preview", text: "This is awesome", visible: true) } }
-
-      it { within(".js-main-target-form") { should have_css(".js-note-preview-button", visible: false) } }
-      it { within(".js-main-target-form") { should have_css(".js-note-edit-button", visible: true) } }
-    end
-  end
-
-  describe "when posting a note" do
-    before do
-      within(".js-main-target-form") do
-        fill_in "note[note]", with: "This is awsome!"
-        find(".js-note-preview-button").trigger("click")
-        click_button "Add Comment"
-      end
-    end
-
-    # note added
-    it { within(".js-main-target-form") { should have_content("This is awsome!") } }
-
-    # reset form
-    it { within(".js-main-target-form") { should have_no_field("note[note]", with: "This is awesome!") } }
-
-    # return from preview
-    it { within(".js-main-target-form") { should have_css(".js-note-preview", visible: false) } }
-    it { within(".js-main-target-form") { should have_css(".js-note-text", visible: true) } }
-
-
-    it "should be removable" do
-      find(".js-note-delete").trigger("click")
-
-      should_not have_css(".note")
-    end
-  end
-end
@@ -1,48 +0,0 @@
-require 'spec_helper'
-
-describe "Profile account page" do
-  let(:user) { create(:user) }
-
-  before do
-    login_as :user
-  end
-
-  describe "when signup is enabled" do
-    before do
-      Gitlab.config.gitlab.stub(:signup_enabled).and_return(true)
-      visit account_profile_path
-    end
-    it { page.should have_content("Remove account") }
-    
-    it "should delete the account", js: true do
-      expect { click_link "Delete account" }.to change {User.count}.by(-1)
-      current_path.should == new_user_session_path
-    end
-  end
-
-  describe "when signup is enabled and user has a project" do
-    before do
-      Gitlab.config.gitlab.stub(:signup_enabled).and_return(true)
-      @project = create(:project, namespace: @user.namespace)
-      @project.team << [@user, :master]
-      visit account_profile_path
-    end
-    it { page.should have_content("Remove account") }
-
-    it "should not allow user to delete the account" do
-      expect { click_link "Delete account" }.not_to change {User.count}.by(-1)
-    end
-  end
-
-  describe "when signup is disabled" do
-    before do
-      Gitlab.config.gitlab.stub(:signup_enabled).and_return(false)
-      visit account_profile_path
-    end
-
-    it "should not have option to remove account" do
-      page.should_not have_content("Remove account")
-      current_path.should == account_profile_path
-    end
-  end
-end
 \ No newline at end of file
@@ -1,67 +0,0 @@
-require 'spec_helper'
-
-describe "Projects", "DeployKeys" do
-  let(:project) { create(:project) }
-
-  before do
-    login_as :user
-    project.team << [@user, :master]
-  end
-
-  describe "GET /keys" do
-    before do
-      @key = create(:key, project: project)
-      visit project_deploy_keys_path(project)
-    end
-
-    subject { page }
-
-    it { should have_content(@key.title) }
-
-    describe "Destroy" do
-      before { visit project_deploy_key_path(project, @key) }
-
-      it "should remove entry" do
-        expect {
-          click_link "Remove"
-        }.to change { project.deploy_keys.count }.by(-1)
-      end
-    end
-  end
-
-  describe "New key" do
-    before do
-      visit project_deploy_keys_path(project)
-      click_link "New Deploy Key"
-    end
-
-    it "should open new key popup" do
-      page.should have_content("New Deploy key")
-    end
-
-    describe "fill in" do
-      before do
-        fill_in "key_title", with: "laptop"
-        fill_in "key_key", with: "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAzrEJUIR6Y03TCE9rIJ+GqTBvgb8t1jI9h5UBzCLuK4VawOmkLornPqLDrGbm6tcwM/wBrrLvVOqi2HwmkKEIecVO0a64A4rIYScVsXIniHRS6w5twyn1MD3sIbN+socBDcaldECQa2u1dI3tnNVcs8wi77fiRe7RSxePsJceGoheRQgC8AZ510UdIlO+9rjIHUdVN7LLyz512auAfYsgx1OfablkQ/XJcdEwDNgi9imI6nAXhmoKUm1IPLT2yKajTIC64AjLOnE0YyCh6+7RFMpiMyu1qiOCpdjYwTgBRiciNRZCH8xIedyCoAmiUgkUT40XYHwLuwiPJICpkAzp7Q== user@laptop"
-      end
-
-      it { expect { click_button "Save" }.to change {Key.count}.by(1) }
-
-      it "should add new key to table" do
-        click_button "Save"
-
-        page.should have_content "laptop"
-      end
-    end
-  end
-
-  describe "Show page" do
-    before do
-      @key = create(:key, project: project)
-      visit project_deploy_key_path(project, @key)
-    end
-
-    it { page.should have_content @key.title }
-    it { page.should have_content @key.key[0..10] }
-  end
-end
@@ -1,17 +0,0 @@
-require 'spec_helper'
-
-describe "Projects" do
-  before { login_as :user }
-
-  describe "DELETE /projects/:id" do
-    before do
-      @project = create(:project, namespace: @user.namespace)
-      @project.team << [@user, :master]
-      visit edit_project_path(@project)
-    end
-
-    it "should be correct path" do
-      expect { click_link "Remove" }.to change {Project.count}.by(-1)
-    end
-  end
-end
@@ -1,17 +0,0 @@
-require 'spec_helper'
-
-describe "Search" do
-  before do
-    login_as :user
-    @project = create(:project)
-    @project.team << [@user, :reporter]
-    visit search_path
-    fill_in "search", with: @project.name[0..3]
-    click_button "Search"
-  end
-
-  it "should show project in search results" do
-    page.should have_content @project.name
-  end
-end
-
@@ -1,49 +0,0 @@
-require 'spec_helper'
-
-describe "Users Security" do
-  describe "Project" do
-    before do
-      @u1 = create(:user)
-    end
-
-    describe "GET /login" do
-      it { new_user_session_path.should_not be_404_for :visitor }
-    end
-
-    describe "GET /keys" do
-      subject { keys_path }
-
-      it { should be_allowed_for @u1 }
-      it { should be_allowed_for :admin }
-      it { should be_allowed_for :user }
-      it { should be_denied_for :visitor }
-    end
-
-    describe "GET /profile" do
-      subject { profile_path }
-
-      it { should be_allowed_for @u1 }
-      it { should be_allowed_for :admin }
-      it { should be_allowed_for :user }
-      it { should be_denied_for :visitor }
-    end
-
-    describe "GET /profile/account" do
-      subject { account_profile_path }
-
-      it { should be_allowed_for @u1 }
-      it { should be_allowed_for :admin }
-      it { should be_allowed_for :user }
-      it { should be_denied_for :visitor }
-    end
-
-    describe "GET /profile/design" do
-      subject { design_profile_path }
-
-      it { should be_allowed_for @u1 }
-      it { should be_allowed_for :admin }
-      it { should be_allowed_for :user }
-      it { should be_denied_for :visitor }
-    end
-  end
-end
@@ -1,243 +0,0 @@
-require 'spec_helper'
-
-describe "Application access" do
-  describe "GET /" do
-    it { root_path.should be_allowed_for :admin }
-    it { root_path.should be_allowed_for :user }
-    it { root_path.should be_denied_for :visitor }
-  end
-
-  describe "GET /projects/new" do
-    it { new_project_path.should be_allowed_for :admin }
-    it { new_project_path.should be_allowed_for :user }
-    it { new_project_path.should be_denied_for :visitor }
-  end
-
-  describe "Project" do
-    let(:project)  { create(:project) }
-
-    let(:master)   { create(:user) }
-    let(:guest)    { create(:user) }
-    let(:reporter) { create(:user) }
-
-    before do
-      # full access
-      project.team << [master, :master]
-
-      # readonly
-      project.team << [reporter, :reporter]
-    end
-
-    describe "GET /project_code" do
-      subject { project_path(project) }
-
-      it { should be_allowed_for master }
-      it { should be_allowed_for reporter }
-      it { should be_denied_for :admin }
-      it { should be_denied_for guest }
-      it { should be_denied_for :user }
-      it { should be_denied_for :visitor }
-    end
-
-    describe "GET /project_code/tree/master" do
-      subject { project_tree_path(project, project.repository.root_ref) }
-
-      it { should be_allowed_for master }
-      it { should be_allowed_for reporter }
-      it { should be_denied_for :admin }
-      it { should be_denied_for guest }
-      it { should be_denied_for :user }
-      it { should be_denied_for :visitor }
-    end
-
-    describe "GET /project_code/commits/master" do
-      subject { project_commits_path(project, project.repository.root_ref, limit: 1) }
-
-      it { should be_allowed_for master }
-      it { should be_allowed_for reporter }
-      it { should be_denied_for :admin }
-      it { should be_denied_for guest }
-      it { should be_denied_for :user }
-      it { should be_denied_for :visitor }
-    end
-
-    describe "GET /project_code/commit/:sha" do
-      subject { project_commit_path(project, project.repository.commit) }
-
-      it { should be_allowed_for master }
-      it { should be_allowed_for reporter }
-      it { should be_denied_for :admin }
-      it { should be_denied_for guest }
-      it { should be_denied_for :user }
-      it { should be_denied_for :visitor }
-    end
-
-    describe "GET /project_code/compare" do
-      subject { project_compare_index_path(project) }
-
-      it { should be_allowed_for master }
-      it { should be_allowed_for reporter }
-      it { should be_denied_for :admin }
-      it { should be_denied_for guest }
-      it { should be_denied_for :user }
-      it { should be_denied_for :visitor }
-    end
-
-    describe "GET /project_code/team" do
-      subject { project_team_index_path(project) }
-
-      it { should be_allowed_for master }
-      it { should be_allowed_for reporter }
-      it { should be_denied_for :admin }
-      it { should be_denied_for guest }
-      it { should be_denied_for :user }
-      it { should be_denied_for :visitor }
-    end
-
-    describe "GET /project_code/wall" do
-      subject { wall_project_path(project) }
-
-      it { should be_allowed_for master }
-      it { should be_allowed_for reporter }
-      it { should be_denied_for :admin }
-      it { should be_denied_for guest }
-      it { should be_denied_for :user }
-      it { should be_denied_for :visitor }
-    end
-
-    describe "GET /project_code/blob" do
-      before do
-        commit = project.repository.commit
-        path = commit.tree.contents.select { |i| i.is_a?(Grit::Blob)}.first.name
-        @blob_path = project_blob_path(project, File.join(commit.id, path))
-      end
-
-      it { @blob_path.should be_allowed_for master }
-      it { @blob_path.should be_allowed_for reporter }
-      it { @blob_path.should be_denied_for :admin }
-      it { @blob_path.should be_denied_for guest }
-      it { @blob_path.should be_denied_for :user }
-      it { @blob_path.should be_denied_for :visitor }
-    end
-
-    describe "GET /project_code/edit" do
-      subject { edit_project_path(project) }
-
-      it { should be_allowed_for master }
-      it { should be_denied_for reporter }
-      it { should be_denied_for :admin }
-      it { should be_denied_for guest }
-      it { should be_denied_for :user }
-      it { should be_denied_for :visitor }
-    end
-
-    describe "GET /project_code/deploy_keys" do
-      subject { project_deploy_keys_path(project) }
-
-      it { should be_allowed_for master }
-      it { should be_denied_for reporter }
-      it { should be_denied_for :admin }
-      it { should be_denied_for guest }
-      it { should be_denied_for :user }
-      it { should be_denied_for :visitor }
-    end
-
-    describe "GET /project_code/issues" do
-      subject { project_issues_path(project) }
-
-      it { should be_allowed_for master }
-      it { should be_allowed_for reporter }
-      it { should be_denied_for :admin }
-      it { should be_denied_for guest }
-      it { should be_denied_for :user }
-      it { should be_denied_for :visitor }
-    end
-
-    describe "GET /project_code/snippets" do
-      subject { project_snippets_path(project) }
-
-      it { should be_allowed_for master }
-      it { should be_allowed_for reporter }
-      it { should be_denied_for :admin }
-      it { should be_denied_for guest }
-      it { should be_denied_for :user }
-      it { should be_denied_for :visitor }
-    end
-
-    describe "GET /project_code/merge_requests" do
-      subject { project_merge_requests_path(project) }
-
-      it { should be_allowed_for master }
-      it { should be_allowed_for reporter }
-      it { should be_denied_for :admin }
-      it { should be_denied_for guest }
-      it { should be_denied_for :user }
-      it { should be_denied_for :visitor }
-    end
-
-    describe "GET /project_code/repository" do
-      subject { project_repository_path(project) }
-
-      it { should be_allowed_for master }
-      it { should be_allowed_for reporter }
-      it { should be_denied_for :admin }
-      it { should be_denied_for guest }
-      it { should be_denied_for :user }
-      it { should be_denied_for :visitor }
-    end
-
-    describe "GET /project_code/repository/branches" do
-      subject { branches_project_repository_path(project) }
-
-      before do
-        # Speed increase
-        Project.any_instance.stub(:branches).and_return([])
-      end
-
-      it { should be_allowed_for master }
-      it { should be_allowed_for reporter }
-      it { should be_denied_for :admin }
-      it { should be_denied_for guest }
-      it { should be_denied_for :user }
-      it { should be_denied_for :visitor }
-    end
-
-    describe "GET /project_code/repository/tags" do
-      subject { tags_project_repository_path(project) }
-
-      before do
-        # Speed increase
-        Project.any_instance.stub(:tags).and_return([])
-      end
-
-      it { should be_allowed_for master }
-      it { should be_allowed_for reporter }
-      it { should be_denied_for :admin }
-      it { should be_denied_for guest }
-      it { should be_denied_for :user }
-      it { should be_denied_for :visitor }
-    end
-
-    describe "GET /project_code/hooks" do
-      subject { project_hooks_path(project) }
-
-      it { should be_allowed_for master }
-      it { should be_allowed_for reporter }
-      it { should be_denied_for :admin }
-      it { should be_denied_for guest }
-      it { should be_denied_for :user }
-      it { should be_denied_for :visitor }
-    end
-
-    describe "GET /project_code/files" do
-      subject { files_project_path(project) }
-
-      it { should be_allowed_for master }
-      it { should be_allowed_for reporter }
-      it { should be_denied_for :admin }
-      it { should be_denied_for guest }
-      it { should be_denied_for :user }
-      it { should be_denied_for :visitor }
-    end
-  end
-end
@@ -1,99 +0,0 @@
-require 'spec_helper'
-
-describe "Snippets" do
-  let(:project) { create(:project) }
-
-  before do
-    login_as :user
-    project.team << [@user, :developer]
-  end
-
-  describe "GET /snippets" do
-    before do
-      @snippet = create(:snippet,
-                        author: @user,
-                        project: project)
-
-      visit project_snippets_path(project)
-    end
-
-    subject { page }
-
-    it { should have_content(@snippet.title[0..10]) }
-    it { should have_content(@snippet.project.name) }
-
-    describe "Destroy" do
-      before do
-        # admin access to remove snippet
-        @user.users_projects.destroy_all
-        project.team << [@user, :master]
-        visit edit_project_snippet_path(project, @snippet)
-      end
-
-      it "should remove entry" do
-        expect {
-          click_link "destroy_snippet_#{@snippet.id}"
-        }.to change { Snippet.count }.by(-1)
-      end
-    end
-  end
-
-  describe "New snippet" do
-    before do
-      visit project_snippets_path(project)
-      click_link "New Snippet"
-    end
-
-    it "should open new snippet popup" do
-      page.current_path.should == new_project_snippet_path(project)
-    end
-
-    describe "fill in", js: true do
-      before do
-        fill_in "snippet_title", with: "login function"
-        fill_in "snippet_file_name", with: "test.rb"
-        page.execute_script("editor.insert('def login; end');")
-      end
-
-      it { expect { click_button "Save" }.to change {Snippet.count}.by(1) }
-
-      it "should add new snippet to table" do
-        click_button "Save"
-        page.current_path.should == project_snippet_path(project, Snippet.last)
-        page.should have_content "login function"
-        page.should have_content "test.rb"
-      end
-    end
-  end
-
-  describe "Edit snippet" do
-    before do
-      @snippet = create(:snippet,
-                        author: @user,
-                        project: project)
-      visit project_snippet_path(project, @snippet)
-      click_link "Edit"
-    end
-
-    it "should open edit page" do
-      page.current_path.should == edit_project_snippet_path(project, @snippet)
-    end
-
-    describe "fill in" do
-      before do
-        fill_in "snippet_title", with: "login function"
-        fill_in "snippet_file_name", with: "test.rb"
-      end
-
-      it { expect { click_button "Save" }.to_not change {Snippet.count} }
-
-      it "should update snippet fields" do
-        click_button "Save"
-
-        page.current_path.should == project_snippet_path(project, @snippet)
-        page.should have_content "login function"
-        page.should have_content "test.rb"
-      end
-    end
-  end
-end
...	...	@@ -0,0 +1,51 @@
	1	+require 'spec_helper'
	2	+
	3	+describe "Admin::Hooks" do
	4	+ before do
	5	+ @project = create(:project)
	6	+ login_as :admin
	7	+
	8	+ @system_hook = create(:system_hook)
	9	+
	10	+ end
	11	+
	12	+ describe "GET /admin/hooks" do
	13	+ it "should be ok" do
	14	+ visit admin_root_path
	15	+ within ".main_menu" do
	16	+ click_on "Hooks"
	17	+ end
	18	+ current_path.should == admin_hooks_path
	19	+ end
	20	+
	21	+ it "should have hooks list" do
	22	+ visit admin_hooks_path
	23	+ page.should have_content(@system_hook.url)
	24	+ end
	25	+ end
	26	+
	27	+ describe "New Hook" do
	28	+ before do
	29	+ @url = Faker::Internet.uri("http")
	30	+ visit admin_hooks_path
	31	+ fill_in "hook_url", with: @url
	32	+ expect { click_button "Add System Hook" }.to change(SystemHook, :count).by(1)
	33	+ end
	34	+
	35	+ it "should open new hook popup" do
	36	+ page.current_path.should == admin_hooks_path
	37	+ page.should have_content(@url)
	38	+ end
	39	+ end
	40	+
	41	+ describe "Test" do
	42	+ before do
	43	+ WebMock.stub_request(:post, @system_hook.url)
	44	+ visit admin_hooks_path
	45	+ click_link "Test Hook"
	46	+ end
	47	+
	48	+ it { page.current_path.should == admin_hooks_path }
	49	+ end
	50	+
	51	+end
...	...
...	...	@@ -0,0 +1,76 @@
	1	+require 'spec_helper'
	2	+
	3	+describe "Admin::Projects" do
	4	+ before do
	5	+ @project = create(:project)
	6	+ login_as :admin
	7	+ end
	8	+
	9	+ describe "GET /admin/projects" do
	10	+ before do
	11	+ visit admin_projects_path
	12	+ end
	13	+
	14	+ it "should be ok" do
	15	+ current_path.should == admin_projects_path
	16	+ end
	17	+
	18	+ it "should have projects list" do
	19	+ page.should have_content(@project.name)
	20	+ end
	21	+ end
	22	+
	23	+ describe "GET /admin/projects/:id" do
	24	+ before do
	25	+ visit admin_projects_path
	26	+ click_link "#{@project.name}"
	27	+ end
	28	+
	29	+ it "should have project info" do
	30	+ page.should have_content(@project.path)
	31	+ page.should have_content(@project.name)
	32	+ end
	33	+ end
	34	+
	35	+ describe "GET /admin/projects/:id/edit" do
	36	+ before do
	37	+ visit admin_projects_path
	38	+ click_link "edit_project_#{@project.id}"
	39	+ end
	40	+
	41	+ it "should have project edit page" do
	42	+ page.should have_content("Edit project")
	43	+ page.should have_button("Save Project")
	44	+ end
	45	+
	46	+ describe "Update project" do
	47	+ before do
	48	+ fill_in "project_name", with: "Big Bang"
	49	+ click_button "Save Project"
	50	+ @project.reload
	51	+ end
	52	+
	53	+ it "should show page with new data" do
	54	+ page.should have_content("Big Bang")
	55	+ end
	56	+
	57	+ it "should change project entry" do
	58	+ @project.name.should == "Big Bang"
	59	+ end
	60	+ end
	61	+ end
	62	+
	63	+ describe "Add new team member" do
	64	+ before do
	65	+ @new_user = create(:user)
	66	+ visit admin_project_path(@project)
	67	+ end
	68	+
	69	+ it "should create new user" do
	70	+ select @new_user.name, from: "user_ids"
	71	+ expect { click_button "Add" }.to change { UsersProject.count }.by(1)
	72	+ page.should have_content @new_user.name
	73	+ current_path.should == admin_project_path(@project)
	74	+ end
	75	+ end
	76	+end
...	...
...	...	@@ -0,0 +1,135 @@
	1	+require 'spec_helper'
	2	+
	3	+describe "Admin::Users" do
	4	+ before { login_as :admin }
	5	+
	6	+ describe "GET /admin/users" do
	7	+ before do
	8	+ visit admin_users_path
	9	+ end
	10	+
	11	+ it "should be ok" do
	12	+ current_path.should == admin_users_path
	13	+ end
	14	+
	15	+ it "should have users list" do
	16	+ page.should have_content(@user.email)
	17	+ page.should have_content(@user.name)
	18	+ end
	19	+ end
	20	+
	21	+ describe "GET /admin/users/new" do
	22	+ before do
	23	+ @password = "123ABC"
	24	+ visit new_admin_user_path
	25	+ fill_in "user_name", with: "Big Bang"
	26	+ fill_in "user_username", with: "bang"
	27	+ fill_in "user_email", with: "bigbang@mail.com"
	28	+ fill_in "user_password", with: @password
	29	+ fill_in "user_password_confirmation", with: @password
	30	+ end
	31	+
	32	+ it "should create new user" do
	33	+ expect { click_button "Save" }.to change {User.count}.by(1)
	34	+ end
	35	+
	36	+ it "should create user with valid data" do
	37	+ click_button "Save"
	38	+ user = User.last
	39	+ user.name.should == "Big Bang"
	40	+ user.email.should == "bigbang@mail.com"
	41	+ end
	42	+
	43	+ it "should call send mail" do
	44	+ Notify.should_receive(:new_user_email)
	45	+
	46	+ User.observers.enable :user_observer do
	47	+ click_button "Save"
	48	+ end
	49	+ end
	50	+
	51	+ it "should send valid email to user with email & password" do
	52	+ Gitlab.config.gitlab.stub(:signup_enabled).and_return(false)
	53	+ User.observers.enable :user_observer do
	54	+ click_button "Save"
	55	+ user = User.last
	56	+ email = ActionMailer::Base.deliveries.last
	57	+ email.subject.should have_content("Account was created")
	58	+ email.body.should have_content(user.email)
	59	+ email.body.should have_content(@password)
	60	+ end
	61	+ end
	62	+
	63	+ it "should send valid email to user with email without password when signup is enabled" do
	64	+ Gitlab.config.gitlab.stub(:signup_enabled).and_return(true)
	65	+ User.observers.enable :user_observer do
	66	+ click_button "Save"
	67	+ user = User.last
	68	+ email = ActionMailer::Base.deliveries.last
	69	+ email.subject.should have_content("Account was created")
	70	+ email.body.should have_content(user.email)
	71	+ email.body.should_not have_content(@password)
	72	+ end
	73	+ end
	74	+ end
	75	+
	76	+ describe "GET /admin/users/:id" do
	77	+ before do
	78	+ visit admin_users_path
	79	+ click_link "#{@user.name}"
	80	+ end
	81	+
	82	+ it "should have user info" do
	83	+ page.should have_content(@user.email)
	84	+ page.should have_content(@user.name)
	85	+ page.should have_content(@user.projects_limit)
	86	+ end
	87	+ end
	88	+
	89	+ describe "GET /admin/users/:id/edit" do
	90	+ before do
	91	+ @simple_user = create(:user)
	92	+ visit admin_users_path
	93	+ click_link "edit_user_#{@simple_user.id}"
	94	+ end
	95	+
	96	+ it "should have user edit page" do
	97	+ page.should have_content("Name")
	98	+ page.should have_content("Password")
	99	+ end
	100	+
	101	+ describe "Update user" do
	102	+ before do
	103	+ fill_in "user_name", with: "Big Bang"
	104	+ fill_in "user_email", with: "bigbang@mail.com"
	105	+ check "user_admin"
	106	+ click_button "Save"
	107	+ end
	108	+
	109	+ it "should show page with new data" do
	110	+ page.should have_content("bigbang@mail.com")
	111	+ page.should have_content("Big Bang")
	112	+ end
	113	+
	114	+ it "should change user entry" do
	115	+ @simple_user.reload
	116	+ @simple_user.name.should == "Big Bang"
	117	+ @simple_user.is_admin?.should be_true
	118	+ end
	119	+ end
	120	+ end
	121	+
	122	+ describe "Add new project" do
	123	+ before do
	124	+ @new_project = create(:project)
	125	+ visit admin_user_path(@user)
	126	+ end
	127	+
	128	+ it "should create new user" do
	129	+ select @new_project.name, from: "project_ids"
	130	+ expect { click_button "Add" }.to change { UsersProject.count }.by(1)
	131	+ page.should have_content @new_project.name
	132	+ current_path.should == admin_user_path(@user)
	133	+ end
	134	+ end
	135	+end
...	...
...	...	@@ -0,0 +1,27 @@
	1	+require 'spec_helper'
	2	+
	3	+describe "Admin::Projects" do
	4	+ describe "GET /admin/projects" do
	5	+ subject { admin_projects_path }
	6	+
	7	+ it { should be_allowed_for :admin }
	8	+ it { should be_denied_for :user }
	9	+ it { should be_denied_for :visitor }
	10	+ end
	11	+
	12	+ describe "GET /admin/users" do
	13	+ subject { admin_users_path }
	14	+
	15	+ it { should be_allowed_for :admin }
	16	+ it { should be_denied_for :user }
	17	+ it { should be_denied_for :visitor }
	18	+ end
	19	+
	20	+ describe "GET /admin/hooks" do
	21	+ subject { admin_hooks_path }
	22	+
	23	+ it { should be_allowed_for :admin }
	24	+ it { should be_denied_for :user }
	25	+ it { should be_denied_for :visitor }
	26	+ end
	27	+end
...	...
...	...	@@ -0,0 +1,24 @@
	1	+require 'spec_helper'
	2	+
	3	+describe "Dashboard Issues Feed" do
	4	+ describe "GET /issues" do
	5	+ let!(:user) { create(:user) }
	6	+ let!(:project1) { create(:project) }
	7	+ let!(:project2) { create(:project) }
	8	+ let!(:issue1) { create(:issue, author: user, assignee: user, project: project1) }
	9	+ let!(:issue2) { create(:issue, author: user, assignee: user, project: project2) }
	10	+
	11	+ describe "atom feed" do
	12	+ it "should render atom feed via private token" do
	13	+ visit issues_dashboard_path(:atom, private_token: user.private_token)
	14	+
	15	+ page.response_headers['Content-Type'].should have_content("application/atom+xml")
	16	+ page.body.should have_selector("title", text: "#{user.name} issues")
	17	+ page.body.should have_selector("author email", text: issue1.author_email)
	18	+ page.body.should have_selector("entry summary", text: issue1.title)
	19	+ page.body.should have_selector("author email", text: issue2.author_email)
	20	+ page.body.should have_selector("entry summary", text: issue2.title)
	21	+ end
	22	+ end
	23	+ end
	24	+end
...	...
...	...	@@ -0,0 +1,14 @@
	1	+require 'spec_helper'
	2	+
	3	+describe "Dashboard Feed" do
	4	+ describe "GET /" do
	5	+ let!(:user) { create(:user) }
	6	+
	7	+ context "projects atom feed via private token" do
	8	+ it "should render projects atom feed" do
	9	+ visit dashboard_path(:atom, private_token: user.private_token)
	10	+ page.body.should have_selector("feed title")
	11	+ end
	12	+ end
	13	+ end
	14	+end
...	...
...	...	@@ -0,0 +1,34 @@
	1	+require 'spec_helper'
	2	+
	3	+describe "Issues Feed" do
	4	+ describe "GET /issues" do
	5	+ let!(:user) { create(:user) }
	6	+ let!(:project) { create(:project, namespace: user.namespace) }
	7	+ let!(:issue) { create(:issue, author: user, project: project) }
	8	+
	9	+ before { project.team << [user, :developer] }
	10	+
	11	+ context "when authenticated" do
	12	+ it "should render atom feed" do
	13	+ login_with user
	14	+ visit project_issues_path(project, :atom)
	15	+
	16	+ page.response_headers['Content-Type'].should have_content("application/atom+xml")
	17	+ page.body.should have_selector("title", text: "#{project.name} issues")
	18	+ page.body.should have_selector("author email", text: issue.author_email)
	19	+ page.body.should have_selector("entry summary", text: issue.title)
	20	+ end
	21	+ end
	22	+
	23	+ context "when authenticated via private token" do
	24	+ it "should render atom feed" do
	25	+ visit project_issues_path(project, :atom, private_token: user.private_token)
	26	+
	27	+ page.response_headers['Content-Type'].should have_content("application/atom+xml")
	28	+ page.body.should have_selector("title", text: "#{project.name} issues")
	29	+ page.body.should have_selector("author email", text: issue.author_email)
	30	+ page.body.should have_selector("entry summary", text: issue.title)
	31	+ end
	32	+ end
	33	+ end
	34	+end
...	...
...	...	@@ -0,0 +1,223 @@
	1	+require 'spec_helper'
	2	+
	3	+describe "Gitlab Flavored Markdown" do
	4	+ let(:project) { create(:project) }
	5	+ let(:issue) { create(:issue, project: project) }
	6	+ let(:merge_request) { create(:merge_request, project: project) }
	7	+ let(:fred) do
	8	+ u = create(:user, name: "fred")
	9	+ project.team << [u, :master]
	10	+ u
	11	+ end
	12	+
	13	+ before do
	14	+ # add test branch
	15	+ @branch_name = "gfm-test"
	16	+ r = project.repo
	17	+ i = r.index
	18	+ # add test file
	19	+ @test_file = "gfm_test_file"
	20	+ i.add(@test_file, "foo\nbar\n")
	21	+ # add commit with gfm
	22	+ i.commit("fix ##{issue.id}\n\nask @#{fred.username} for details", head: @branch_name)
	23	+
	24	+ # add test tag
	25	+ @tag_name = "gfm-test-tag"
	26	+ r.git.native(:tag, {}, @tag_name, commit.id)
	27	+ end
	28	+
	29	+ after do
	30	+ # delete test branch and tag
	31	+ project.repo.git.native(:branch, {D: true}, @branch_name)
	32	+ project.repo.git.native(:tag, {d: true}, @tag_name)
	33	+ project.repo.gc_auto
	34	+ end
	35	+
	36	+ let(:commit) { project.repository.commits(@branch_name).first }
	37	+
	38	+ before do
	39	+ login_as :user
	40	+ project.team << [@user, :developer]
	41	+ end
	42	+
	43	+ describe "for commits" do
	44	+ it "should render title in commits#index" do
	45	+ visit project_commits_path(project, @branch_name, limit: 1)
	46	+
	47	+ page.should have_link("##{issue.id}")
	48	+ end
	49	+
	50	+ it "should render title in commits#show" do
	51	+ visit project_commit_path(project, commit)
	52	+
	53	+ page.should have_link("##{issue.id}")
	54	+ end
	55	+
	56	+ it "should render description in commits#show" do
	57	+ visit project_commit_path(project, commit)
	58	+
	59	+ page.should have_link("@#{fred.username}")
	60	+ end
	61	+
	62	+ it "should render title in refs#tree", js: true do
	63	+ visit project_tree_path(project, @branch_name)
	64	+
	65	+ within(".tree_commit") do
	66	+ page.should have_link("##{issue.id}")
	67	+ end
	68	+ end
	69	+
	70	+ # @wip
	71	+ #it "should render title in refs#blame" do
	72	+ #visit project_blame_path(project, File.join(@branch_name, @test_file))
	73	+
	74	+ #within(".blame_commit") do
	75	+ #page.should have_link("##{issue.id}")
	76	+ #end
	77	+ #end
	78	+
	79	+ it "should render title in repositories#branches" do
	80	+ visit branches_project_repository_path(project)
	81	+
	82	+ page.should have_link("##{issue.id}")
	83	+ end
	84	+ end
	85	+
	86	+ describe "for issues" do
	87	+ before do
	88	+ @other_issue = create(:issue,
	89	+ author: @user,
	90	+ assignee: @user,
	91	+ project: project)
	92	+ @issue = create(:issue,
	93	+ author: @user,
	94	+ assignee: @user,
	95	+ project: project,
	96	+ title: "fix ##{@other_issue.id}",
	97	+ description: "ask @#{fred.username} for details")
	98	+ end
	99	+
	100	+ it "should render subject in issues#index" do
	101	+ visit project_issues_path(project)
	102	+
	103	+ page.should have_link("##{@other_issue.id}")
	104	+ end
	105	+
	106	+ it "should render subject in issues#show" do
	107	+ visit project_issue_path(project, @issue)
	108	+
	109	+ page.should have_link("##{@other_issue.id}")
	110	+ end
	111	+
	112	+ it "should render details in issues#show" do
	113	+ visit project_issue_path(project, @issue)
	114	+
	115	+ page.should have_link("@#{fred.username}")
	116	+ end
	117	+ end
	118	+
	119	+
	120	+ describe "for merge requests" do
	121	+ before do
	122	+ @merge_request = create(:merge_request,
	123	+ project: project,
	124	+ title: "fix ##{issue.id}")
	125	+ end
	126	+
	127	+ it "should render title in merge_requests#index" do
	128	+ visit project_merge_requests_path(project)
	129	+
	130	+ page.should have_link("##{issue.id}")
	131	+ end
	132	+
	133	+ it "should render title in merge_requests#show" do
	134	+ visit project_merge_request_path(project, @merge_request)
	135	+
	136	+ page.should have_link("##{issue.id}")
	137	+ end
	138	+ end
	139	+
	140	+
	141	+ describe "for milestones" do
	142	+ before do
	143	+ @milestone = create(:milestone,
	144	+ project: project,
	145	+ title: "fix ##{issue.id}",
	146	+ description: "ask @#{fred.username} for details")
	147	+ end
	148	+
	149	+ it "should render title in milestones#index" do
	150	+ visit project_milestones_path(project)
	151	+
	152	+ page.should have_link("##{issue.id}")
	153	+ end
	154	+
	155	+ it "should render title in milestones#show" do
	156	+ visit project_milestone_path(project, @milestone)
	157	+
	158	+ page.should have_link("##{issue.id}")
	159	+ end
	160	+
	161	+ it "should render description in milestones#show" do
	162	+ visit project_milestone_path(project, @milestone)
	163	+
	164	+ page.should have_link("@#{fred.username}")
	165	+ end
	166	+ end
	167	+
	168	+
	169	+ describe "for notes" do
	170	+ it "should render in commits#show", js: true do
	171	+ visit project_commit_path(project, commit)
	172	+ fill_in "note_note", with: "see ##{issue.id}"
	173	+ click_button "Add Comment"
	174	+
	175	+ page.should have_link("##{issue.id}")
	176	+ end
	177	+
	178	+ it "should render in issue#show", js: true do
	179	+ visit project_issue_path(project, issue)
	180	+ fill_in "note_note", with: "see ##{issue.id}"
	181	+ click_button "Add Comment"
	182	+
	183	+ page.should have_link("##{issue.id}")
	184	+ end
	185	+
	186	+ it "should render in merge_request#show", js: true do
	187	+ visit project_merge_request_path(project, merge_request)
	188	+ fill_in "note_note", with: "see ##{issue.id}"
	189	+ click_button "Add Comment"
	190	+
	191	+ page.should have_link("##{issue.id}")
	192	+ end
	193	+
	194	+ it "should render in projects#wall", js: true do
	195	+ visit wall_project_path(project)
	196	+ fill_in "note_note", with: "see ##{issue.id}"
	197	+ click_button "Add Comment"
	198	+
	199	+ page.should have_link("##{issue.id}")
	200	+ end
	201	+ end
	202	+
	203	+
	204	+ describe "for wikis" do
	205	+ before do
	206	+ visit project_wiki_path(project, :index)
	207	+ fill_in "Title", with: "Circumvent ##{issue.id}"
	208	+ fill_in "Content", with: "# Other pages\n\n* [Foo](foo)\n* [Bar](bar)\n\nAlso look at ##{issue.id} :-)"
	209	+ click_on "Save"
	210	+ end
	211	+
	212	+ it "should NOT render title in wikis#show" do
	213	+ within(".content h3") do # page title
	214	+ page.should have_content("Circumvent ##{issue.id}")
	215	+ page.should_not have_link("##{issue.id}")
	216	+ end
	217	+ end
	218	+
	219	+ it "should render content in wikis#show" do
	220	+ page.should have_link("##{issue.id}")
	221	+ end
	222	+ end
	223	+end
...	...
...	...	@@ -0,0 +1,132 @@
	1	+require 'spec_helper'
	2	+
	3	+describe "Issues" do
	4	+ let(:project) { create(:project) }
	5	+
	6	+ before do
	7	+ login_as :user
	8	+ user2 = create(:user)
	9	+
	10	+ project.team << [[@user, user2], :developer]
	11	+ end
	12	+
	13	+ describe "Edit issue" do
	14	+ let!(:issue) do
	15	+ create(:issue,
	16	+ author: @user,
	17	+ assignee: @user,
	18	+ project: project)
	19	+ end
	20	+
	21	+ before do
	22	+ visit project_issues_path(project)
	23	+ click_link "Edit"
	24	+ end
	25	+
	26	+ it "should open new issue popup" do
	27	+ page.should have_content("Issue ##{issue.id}")
	28	+ end
	29	+
	30	+ describe "fill in" do
	31	+ before do
	32	+ fill_in "issue_title", with: "bug 345"
	33	+ fill_in "issue_description", with: "bug description"
	34	+ end
	35	+
	36	+ it { expect { click_button "Save changes" }.to_not change {Issue.count} }
	37	+
	38	+ it "should update issue fields" do
	39	+ click_button "Save changes"
	40	+
	41	+ page.should have_content @user.name
	42	+ page.should have_content "bug 345"
	43	+ page.should have_content project.name
	44	+ end
	45	+ end
	46	+ end
	47	+
	48	+ describe "Search issue", js: true do
	49	+ before do
	50	+ ['foobar', 'foobar2', 'gitlab'].each do \|title\|
	51	+ create(:issue,
	52	+ author: @user,
	53	+ assignee: @user,
	54	+ project: project,
	55	+ title: title)
	56	+ end
	57	+ end
	58	+
	59	+ it "should be able to search on different statuses" do
	60	+ issue = Issue.first # with title 'foobar'
	61	+ issue.close
	62	+
	63	+ visit project_issues_path(project)
	64	+ click_link 'Closed'
	65	+ fill_in 'issue_search', with: 'foobar'
	66	+
	67	+ page.should have_content 'foobar'
	68	+ page.should_not have_content 'foobar2'
	69	+ page.should_not have_content 'gitlab'
	70	+ end
	71	+
	72	+ it "should search for term and return the correct results" do
	73	+ visit project_issues_path(project)
	74	+ fill_in 'issue_search', with: 'foobar'
	75	+
	76	+ page.should have_content 'foobar'
	77	+ page.should have_content 'foobar2'
	78	+ page.should_not have_content 'gitlab'
	79	+ end
	80	+ end
	81	+
	82	+ describe "Filter issue" do
	83	+ before do
	84	+ ['foobar', 'barbaz', 'gitlab'].each do \|title\|
	85	+ create(:issue,
	86	+ author: @user,
	87	+ assignee: @user,
	88	+ project: project,
	89	+ title: title)
	90	+ end
	91	+
	92	+ @issue = Issue.first # with title 'foobar'
	93	+ @issue.milestone = create(:milestone, project: project)
	94	+ @issue.assignee = nil
	95	+ @issue.save
	96	+ end
	97	+
	98	+ let(:issue) { @issue }
	99	+
	100	+ it "should allow filtering by issues with no specified milestone" do
	101	+ visit project_issues_path(project, milestone_id: '0')
	102	+
	103	+ page.should_not have_content 'foobar'
	104	+ page.should have_content 'barbaz'
	105	+ page.should have_content 'gitlab'
	106	+ end
	107	+
	108	+ it "should allow filtering by a specified milestone" do
	109	+ visit project_issues_path(project, milestone_id: issue.milestone.id)
	110	+
	111	+ page.should have_content 'foobar'
	112	+ page.should_not have_content 'barbaz'
	113	+ page.should_not have_content 'gitlab'
	114	+ end
	115	+
	116	+ it "should allow filtering by issues with no specified assignee" do
	117	+ visit project_issues_path(project, assignee_id: '0')
	118	+
	119	+ page.should have_content 'foobar'
	120	+ page.should_not have_content 'barbaz'
	121	+ page.should_not have_content 'gitlab'
	122	+ end
	123	+
	124	+ it "should allow filtering by a specified assignee" do
	125	+ visit project_issues_path(project, assignee_id: @user.id)
	126	+
	127	+ page.should_not have_content 'foobar'
	128	+ page.should have_content 'barbaz'
	129	+ page.should have_content 'gitlab'
	130	+ end
	131	+ end
	132	+end
...	...
...	...	@@ -0,0 +1,234 @@
	1	+require 'spec_helper'
	2	+
	3	+describe "On a merge request", js: true do
	4	+ let!(:project) { create(:project) }
	5	+ let!(:merge_request) { create(:merge_request, project: project) }
	6	+
	7	+ before do
	8	+ login_as :user
	9	+ project.team << [@user, :master]
	10	+
	11	+ visit project_merge_request_path(project, merge_request)
	12	+ end
	13	+
	14	+ subject { page }
	15	+
	16	+ describe "the note form" do
	17	+ # main target form creation
	18	+ it { should have_css(".js-main-target-form", visible: true, count: 1) }
	19	+
	20	+ # button initalization
	21	+ it { within(".js-main-target-form") { should have_button("Add Comment") } }
	22	+ it { within(".js-main-target-form") { should_not have_link("Cancel") } }
	23	+
	24	+ # notifiactions
	25	+ it { within(".js-main-target-form") { should have_checked_field("Notify team via email") } }
	26	+ it { within(".js-main-target-form") { should_not have_checked_field("Notify commit author") } }
	27	+ it { within(".js-main-target-form") { should_not have_unchecked_field("Notify commit author") } }
	28	+
	29	+ describe "without text" do
	30	+ it { within(".js-main-target-form") { should have_css(".js-note-preview-button", visible: false) } }
	31	+ end
	32	+
	33	+ describe "with text" do
	34	+ before do
	35	+ within(".js-main-target-form") do
	36	+ fill_in "note[note]", with: "This is awesome"
	37	+ end
	38	+ end
	39	+
	40	+ it { within(".js-main-target-form") { should_not have_css(".js-comment-button[disabled]") } }
	41	+
	42	+ it { within(".js-main-target-form") { should have_css(".js-note-preview-button", visible: true) } }
	43	+ end
	44	+
	45	+ describe "with preview" do
	46	+ before do
	47	+ within(".js-main-target-form") do
	48	+ fill_in "note[note]", with: "This is awesome"
	49	+ find(".js-note-preview-button").trigger("click")
	50	+ end
	51	+ end
	52	+
	53	+ it { within(".js-main-target-form") { should have_css(".js-note-preview", text: "This is awesome", visible: true) } }
	54	+
	55	+ it { within(".js-main-target-form") { should have_css(".js-note-preview-button", visible: false) } }
	56	+ it { within(".js-main-target-form") { should have_css(".js-note-edit-button", visible: true) } }
	57	+ end
	58	+ end
	59	+
	60	+ describe "when posting a note" do
	61	+ before do
	62	+ within(".js-main-target-form") do
	63	+ fill_in "note[note]", with: "This is awsome!"
	64	+ find(".js-note-preview-button").trigger("click")
	65	+ click_button "Add Comment"
	66	+ end
	67	+ end
	68	+
	69	+ # note added
	70	+ it { within(".js-main-target-form") { should have_content("This is awsome!") } }
	71	+
	72	+ # reset form
	73	+ it { within(".js-main-target-form") { should have_no_field("note[note]", with: "This is awesome!") } }
	74	+
	75	+ # return from preview
	76	+ it { within(".js-main-target-form") { should have_css(".js-note-preview", visible: false) } }
	77	+ it { within(".js-main-target-form") { should have_css(".js-note-text", visible: true) } }
	78	+
	79	+
	80	+ it "should be removable" do
	81	+ find(".js-note-delete").trigger("click")
	82	+
	83	+ should_not have_css(".note")
	84	+ end
	85	+ end
	86	+end
	87	+
	88	+
	89	+
	90	+describe "On a merge request diff", js: true, focus: true do
	91	+ let!(:project) { create(:project) }
	92	+ let!(:merge_request) { create(:merge_request_with_diffs, project: project) }
	93	+
	94	+ before do
	95	+ login_as :user
	96	+ project.team << [@user, :master]
	97	+
	98	+ visit diffs_project_merge_request_path(project, merge_request)
	99	+
	100	+ within '.diffs-tab' do
	101	+ click_link("Diff")
	102	+ end
	103	+ end
	104	+
	105	+ subject { page }
	106	+
	107	+ describe "when adding a note" do
	108	+ before do
	109	+ find("#4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185.line_holder .js-add-diff-note-button").trigger("click")
	110	+ end
	111	+
	112	+ describe "the notes holder" do
	113	+ it { should have_css("#4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185.line_holder + .js-temp-notes-holder") }
	114	+
	115	+ it { within(".js-temp-notes-holder") { should have_css(".new_note") } }
	116	+ end
	117	+
	118	+ describe "the note form" do
	119	+ # set up hidden fields correctly
	120	+ it { within(".js-temp-notes-holder") { find("#note_noteable_type").value.should == "MergeRequest" } }
	121	+ it { within(".js-temp-notes-holder") { find("#note_noteable_id").value.should == merge_request.id.to_s } }
	122	+ it { within(".js-temp-notes-holder") { find("#note_commit_id").value.should == "" } }
	123	+ it { within(".js-temp-notes-holder") { find("#note_line_code").value.should == "4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185" } }
	124	+
	125	+ # buttons
	126	+ it { should have_button("Add Comment") }
	127	+ it { should have_css(".js-close-discussion-note-form", text: "Cancel") }
	128	+
	129	+ # notification options
	130	+ it { should have_checked_field("Notify team via email") }
	131	+
	132	+ it "shouldn't add a second form for same row" do
	133	+ find("#4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185.line_holder .js-add-diff-note-button").trigger("click")
	134	+
	135	+ should have_css("#4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185.line_holder + .js-temp-notes-holder form", count: 1)
	136	+ end
	137	+
	138	+ it "should be removed when canceled" do
	139	+ find(".js-close-discussion-note-form").trigger("click")
	140	+
	141	+ should have_no_css(".js-temp-notes-holder")
	142	+ end
	143	+ end
	144	+ end
	145	+
	146	+ describe "with muliple note forms" do
	147	+ before do
	148	+ find("#4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185.line_holder .js-add-diff-note-button").trigger("click")
	149	+ find("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder .js-add-diff-note-button").trigger("click")
	150	+ end
	151	+
	152	+ # has two line forms
	153	+ it { should have_css(".js-temp-notes-holder", count: 2) }
	154	+
	155	+ describe "previewing them separately" do
	156	+ before do
	157	+ # add two separate texts and trigger previews on both
	158	+ within("#4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185.line_holder + .js-temp-notes-holder") do
	159	+ fill_in "note[note]", with: "One comment on line 185"
	160	+ find(".js-note-preview-button").trigger("click")
	161	+ end
	162	+ within("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder + .js-temp-notes-holder") do
	163	+ fill_in "note[note]", with: "Another comment on line 17"
	164	+ find(".js-note-preview-button").trigger("click")
	165	+ end
	166	+ end
	167	+
	168	+ # check if previews were rendered separately
	169	+ it { within("#4735dfc552ad7bf15ca468adc3cad9d05b624490_185_185.line_holder + .js-temp-notes-holder") { should have_css(".js-note-preview", text: "One comment on line 185") } }
	170	+ it { within("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder + .js-temp-notes-holder") { should have_css(".js-note-preview", text: "Another comment on line 17") } }
	171	+ end
	172	+
	173	+ describe "posting a note" do
	174	+ before do
	175	+ within("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder + .js-temp-notes-holder") do
	176	+ fill_in "note[note]", with: "Another comment on line 17"
	177	+ click_button("Add Comment")
	178	+ end
	179	+ end
	180	+
	181	+ # removed form after submit
	182	+ it { should have_no_css("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder + .js-temp-notes-holder") }
	183	+
	184	+ # added discussion
	185	+ it { should have_content("Another comment on line 17") }
	186	+ it { should have_css("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder + .notes_holder") }
	187	+ it { should have_css("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder + .notes_holder .note", count: 1) }
	188	+ it { should have_link("Reply") }
	189	+
	190	+ it "should remove last note of a discussion" do
	191	+ within("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder + .notes_holder") do
	192	+ find(".js-note-delete").trigger("click")
	193	+ end
	194	+
	195	+ # removed whole discussion
	196	+ should_not have_css(".note_holder")
	197	+ should have_css("#342e16cbbd482ac2047dc679b2749d248cc1428f_18_17.line_holder + #342e16cbbd482ac2047dc679b2749d248cc1428f_18_18.line_holder")
	198	+ end
	199	+ end
	200	+ end
	201	+
	202	+ describe "when replying to a note" do
	203	+ before do
	204	+ # create first note
	205	+ find("#4735dfc552ad7bf15ca468adc3cad9d05b624490_184_184.line_holder .js-add-diff-note-button").trigger("click")
	206	+ within("#4735dfc552ad7bf15ca468adc3cad9d05b624490_184_184.line_holder + .js-temp-notes-holder") do
	207	+ fill_in "note[note]", with: "One comment on line 184"
	208	+ click_button("Add Comment")
	209	+ end
	210	+ # create second note
	211	+ within("#4735dfc552ad7bf15ca468adc3cad9d05b624490_184_184.line_holder + .notes_holder") do
	212	+ find(".js-discussion-reply-button").trigger("click")
	213	+ fill_in "note[note]", with: "An additional comment in reply"
	214	+ click_button("Add Comment")
	215	+ end
	216	+ end
	217	+
	218	+ # inserted note
	219	+ it { should have_content("An additional comment in reply") }
	220	+ it { within("#4735dfc552ad7bf15ca468adc3cad9d05b624490_184_184.line_holder + .notes_holder") { should have_css(".note", count: 2) } }
	221	+
	222	+ # removed form after reply
	223	+ it { within("#4735dfc552ad7bf15ca468adc3cad9d05b624490_184_184.line_holder + .notes_holder") { should have_no_css("form") } }
	224	+ it { within("#4735dfc552ad7bf15ca468adc3cad9d05b624490_184_184.line_holder + .notes_holder") { should have_link("Reply") } }
	225	+ end
	226	+end
	227	+
	228	+
	229	+
	230	+describe "On merge request discussion", js: true do
	231	+ describe "with merge request diff note"
	232	+ describe "with commit note"
	233	+ describe "with commit diff note"
	234	+end
...	...