1 files changed, 98 insertions, 82 deletions

diff --git a/spec/features/issues_spec.rb b/spec/features/issues_spec.rb
index 26607b0090c..a2db57ad908 100644
--- a/spec/features/issues_spec.rb
+++ b/spec/features/issues_spec.rb
@@ -1,6 +1,8 @@
 require 'spec_helper'
 
-describe "Issues", feature: true do
+describe 'Issues', feature: true do
+  include SortingHelper
+
   let(:project) { create(:project) }
 
   before do
@@ -10,7 +12,7 @@ describe "Issues", feature: true do
     project.team << [[@user, user2], :developer]
   end
 
-  describe "Edit issue" do
+  describe 'Edit issue' do
     let!(:issue) do
       create(:issue,
              author: @user,
@@ -19,34 +21,38 @@ describe "Issues", feature: true do
     end
 
     before do
-      visit project_issues_path(project)
+      visit namespace_project_issues_path(project.namespace, project)
       click_link "Edit"
     end
 
-    it "should open new issue popup" do
-      page.should have_content("Issue ##{issue.iid}")
+    it 'should open new issue popup' do
+      expect(page).to have_content("Issue ##{issue.iid}")
     end
 
-    describe "fill in" do
+    describe 'fill in' do
       before do
-        fill_in "issue_title", with: "bug 345"
-        fill_in "issue_description", with: "bug description"
+        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 'does not change issue count' do
+        expect {
+          click_button 'Save changes'
+        }.to_not change { Issue.count }
+      end
 
-      it "should update issue fields" do
-        click_button "Save changes"
+      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
+        expect(page).to have_content @user.name
+        expect(page).to have_content 'bug 345'
+        expect(page).to have_content project.name
       end
     end
 
   end
 
-  describe "Editing issue assignee" do
+  describe 'Editing issue assignee' do
     let!(:issue) do
       create(:issue,
              author: @user,
@@ -54,23 +60,23 @@ describe "Issues", feature: true do
              project: project)
     end
 
-    it 'allows user to select unasigned', :js => true do
-      visit edit_project_issue_path(project, issue)
+    it 'allows user to select unasigned', js: true do
+      visit edit_namespace_project_issue_path(project.namespace, project, issue)
 
-      page.should have_content "Assign to #{@user.name}"
+      expect(page).to have_content "Assign to #{@user.name}"
 
       first('#s2id_issue_assignee_id').click
       sleep 2 # wait for ajax stuff to complete
       first('.user-result').click
 
-      click_button "Save changes"
+      click_button 'Save changes'
 
-      page.should have_content "Assignee: Select assignee"
-      issue.reload.assignee.should be_nil
+      expect(page).to have_content 'Assignee: none'
+      expect(issue.reload.assignee).to be_nil
     end
   end
 
-  describe "Filter issue" do
+  describe 'Filter issue' do
     before do
       ['foobar', 'barbaz', 'gitlab'].each do |title|
         create(:issue,
@@ -80,7 +86,7 @@ describe "Issues", feature: true do
                title: title)
       end
 
-      @issue = Issue.first # with title 'foobar'
+      @issue = Issue.find_by(title: 'foobar')
       @issue.milestone = create(:milestone, project: project)
       @issue.assignee = nil
       @issue.save
@@ -88,75 +94,79 @@ describe "Issues", feature: true do
 
     let(:issue) { @issue }
 
-    it "should allow filtering by issues with no specified milestone" do
-      visit project_issues_path(project, milestone_id: '0')
+    it 'should allow filtering by issues with no specified milestone' do
+      visit namespace_project_issues_path(project.namespace, project, milestone_id: '0')
 
-      page.should_not have_content 'foobar'
-      page.should have_content 'barbaz'
-      page.should have_content 'gitlab'
+      expect(page).not_to have_content 'foobar'
+      expect(page).to have_content 'barbaz'
+      expect(page).to have_content 'gitlab'
     end
 
-    it "should allow filtering by a specified milestone" do
-      visit project_issues_path(project, milestone_id: issue.milestone.id)
+    it 'should allow filtering by a specified milestone' do
+      visit namespace_project_issues_path(project.namespace, project, milestone_id: issue.milestone.id)
 
-      page.should have_content 'foobar'
-      page.should_not have_content 'barbaz'
-      page.should_not have_content 'gitlab'
+      expect(page).to have_content 'foobar'
+      expect(page).not_to have_content 'barbaz'
+      expect(page).not_to have_content 'gitlab'
     end
 
-    it "should allow filtering by issues with no specified assignee" do
-      visit project_issues_path(project, assignee_id: '0')
+    it 'should allow filtering by issues with no specified assignee' do
+      visit namespace_project_issues_path(project.namespace, project, assignee_id: '0')
 
-      page.should have_content 'foobar'
-      page.should_not have_content 'barbaz'
-      page.should_not have_content 'gitlab'
+      expect(page).to have_content 'foobar'
+      expect(page).not_to have_content 'barbaz'
+      expect(page).not_to have_content 'gitlab'
     end
 
-    it "should allow filtering by a specified assignee" do
-      visit project_issues_path(project, assignee_id: @user.id)
+    it 'should allow filtering by a specified assignee' do
+      visit namespace_project_issues_path(project.namespace, project, assignee_id: @user.id)
 
-      page.should_not have_content 'foobar'
-      page.should have_content 'barbaz'
-      page.should have_content 'gitlab'
+      expect(page).not_to have_content 'foobar'
+      expect(page).to have_content 'barbaz'
+      expect(page).to have_content 'gitlab'
     end
   end
 
   describe 'filter issue' do
     titles = ['foo','bar','baz']
     titles.each_with_index do |title, index|
-      let!(title.to_sym) { create(:issue, title: title, project: project, created_at: Time.now - (index * 60)) }
+      let!(title.to_sym) do
+        create(:issue, title: title,
+                       project: project,
+                       created_at: Time.now - (index * 60))
+      end
     end
     let(:newer_due_milestone) { create(:milestone, due_date: '2013-12-11') }
     let(:later_due_milestone) { create(:milestone, due_date: '2013-12-12') }
 
     it 'sorts by newest' do
-      visit project_issues_path(project, sort: 'newest')
+      visit namespace_project_issues_path(project.namespace, project, sort: sort_value_recently_created)
 
-      first_issue.should include("foo")
-      last_issue.should include("baz")
+      expect(first_issue).to include('foo')
+      expect(last_issue).to include('baz')
     end
 
     it 'sorts by oldest' do
-      visit project_issues_path(project, sort: 'oldest')
+      visit namespace_project_issues_path(project.namespace, project, sort: sort_value_oldest_created)
 
-      first_issue.should include("baz")
-      last_issue.should include("foo")
+      expect(first_issue).to include('baz')
+      expect(last_issue).to include('foo')
     end
 
     it 'sorts by most recently updated' do
       baz.updated_at = Time.now + 100
       baz.save
-      visit project_issues_path(project, sort: 'recently_updated')
+      visit namespace_project_issues_path(project.namespace, project, sort: sort_value_recently_updated)
 
-      first_issue.should include("baz")
+      expect(first_issue).to include('baz')
     end
 
     it 'sorts by least recently updated' do
       baz.updated_at = Time.now - 100
       baz.save
-      visit project_issues_path(project, sort: 'last_updated')
+      visit namespace_project_issues_path(project.namespace, project, sort: sort_value_oldest_updated)
 
-      first_issue.should include("baz")
+      expect(first_issue).to include('baz')
     end
 
     describe 'sorting by milestone' do
@@ -168,15 +178,15 @@ describe "Issues", feature: true do
       end
 
       it 'sorts by recently due milestone' do
-        visit project_issues_path(project, sort: 'milestone_due_soon')
+        visit namespace_project_issues_path(project.namespace, project, sort: sort_value_milestone_soon)
 
-        first_issue.should include("foo")
+        expect(first_issue).to include('foo')
       end
 
       it 'sorts by least recently due milestone' do
-        visit project_issues_path(project, sort: 'milestone_due_later')
+        visit namespace_project_issues_path(project.namespace, project, sort: sort_value_milestone_later)
 
-        first_issue.should include("bar")
+        expect(first_issue).to include('bar')
       end
     end
 
@@ -191,11 +201,13 @@ describe "Issues", feature: true do
       end
 
       it 'sorts with a filter applied' do
-        visit project_issues_path(project, sort: 'oldest', assignee_id: user2.id)
+        visit namespace_project_issues_path(project.namespace, project,
+                                            sort: sort_value_oldest_created,
+                                            assignee_id: user2.id)
 
-        first_issue.should include("bar")
-        last_issue.should include("foo")
-        page.should_not have_content 'baz'
+        expect(first_issue).to include('bar')
+        expect(last_issue).to include('foo')
+        expect(page).not_to have_content 'baz'
       end
     end
   end
@@ -206,13 +218,15 @@ describe "Issues", feature: true do
     context 'by autorized user' do
 
       it 'with dropdown menu' do
-        visit project_issue_path(project, issue)
+        visit namespace_project_issue_path(project.namespace, project, issue)
 
-        find('.edit-issue.inline-update #issue_assignee_id').set project.team.members.first.id
+        find('.edit-issue.inline-update #issue_assignee_id').
+          set project.team.members.first.id
         click_button 'Update Issue'
 
-        page.should have_content "Assignee:"
-        has_select?('issue_assignee_id', :selected => project.team.members.first.name)
+        expect(page).to have_content 'Assignee:'
+        has_select?('issue_assignee_id',
+                    selected: project.team.members.first.name)
       end
     end
 
@@ -226,12 +240,12 @@ describe "Issues", feature: true do
         issue.save
       end
 
-      it "shows assignee text", js: true do
+      it 'shows assignee text', js: true do
         logout
         login_with guest
 
-        visit project_issue_path(project, issue)
-        page.should have_content issue.assignee.name
+        visit namespace_project_issue_path(project.namespace, project, issue)
+        expect(page).to have_content issue.assignee.name
       end
     end
   end
@@ -243,13 +257,15 @@ describe "Issues", feature: true do
     context 'by authorized user' do
 
       it 'with dropdown menu' do
-        visit project_issue_path(project, issue)
+        visit namespace_project_issue_path(project.namespace, project, issue)
 
-        find('.edit-issue.inline-update').select(milestone.title, from: 'issue_milestone_id')
+        find('.edit-issue.inline-update').
+          select(milestone.title, from: 'issue_milestone_id')
         click_button 'Update Issue'
 
-        page.should have_content "Milestone changed to #{milestone.title}"
-        has_select?('issue_assignee_id', :selected => milestone.title)
+        expect(page).to have_content "Milestone changed to #{milestone.title}"
+        expect(page).to have_content "Milestone: #{milestone.title}"
+        has_select?('issue_assignee_id', selected: milestone.title)
       end
     end
 
@@ -262,12 +278,12 @@ describe "Issues", feature: true do
         issue.save
       end
 
-      it "shows milestone text", js: true do
+      it 'shows milestone text', js: true do
         logout
         login_with guest
 
-        visit project_issue_path(project, issue)
-        page.should have_content milestone.title
+        visit namespace_project_issue_path(project.namespace, project, issue)
+        expect(page).to have_content milestone.title
       end
     end
 
@@ -280,25 +296,25 @@ describe "Issues", feature: true do
       end
 
       it 'allows user to remove assignee', :js => true do
-        visit project_issue_path(project, issue)
-        page.should have_content "Assignee: #{user2.name}"
+        visit namespace_project_issue_path(project.namespace, project, issue)
+        expect(page).to have_content "Assignee: #{user2.name}"
 
         first('#s2id_issue_assignee_id').click
         sleep 2 # wait for ajax stuff to complete
         first('.user-result').click
 
-        page.should have_content "Assignee: Unassigned"
+        expect(page).to have_content 'Assignee: none'
         sleep 2 # wait for ajax stuff to complete
-        issue.reload.assignee.should be_nil
+        expect(issue.reload.assignee).to be_nil
       end
     end
   end
 
   def first_issue
-    all("ul.issues-list li").first.text
+    all('ul.issues-list li').first.text
   end
 
   def last_issue
-    all("ul.issues-list li").last.text
+    all('ul.issues-list li').last.text
   end
 end