Merge remote-tracking branch 'upstream/master'

1 files changed, 6 insertions, 8 deletions

diff --git a/spec/requests/issues_spec.rb b/spec/requests/issues_spec.rb
index 62daf168b78..bff99531ee7 100644
--- a/spec/requests/issues_spec.rb
+++ b/spec/requests/issues_spec.rb
@@ -51,17 +51,17 @@ describe "Issues" do
         # admin access to remove issue
         @user.users_projects.destroy_all
         project.add_access(@user, :read, :write, :admin)
-        visit project_issues_path(project)
+        visit edit_project_issue_path(project, @issue)
       end
 
       it "should remove entry" do
         expect {
-          click_link "destroy_issue_#{@issue.id}"
+          click_link "Remove"
         }.to change { Issue.count }.by(-1)
       end
     end
 
-    describe "statuses", :js => true do
+    describe "statuses" do
       before do
         @closed_issue = Factory :issue,
           :author => @user,
@@ -76,13 +76,13 @@ describe "Issues" do
       end
 
       it "should show only closed" do
-        choose "closed_issues"
+        click_link "Closed"
         should have_no_content(@issue.title)
         should have_content(@closed_issue.title[0..25])
       end
 
       it "should show all" do
-        choose "all_issues"
+        click_link "All"
         should have_content(@issue.title[0..25])
         should have_content(@closed_issue.title[0..25])
       end
@@ -182,7 +182,6 @@ describe "Issues" do
         :assignee => @user,
         :project => project
       visit project_issues_path(project)
-      page.execute_script("$('.action-links').css('display', 'block');")
       click_link "Edit"
     end
 
@@ -200,7 +199,6 @@ describe "Issues" do
       it "should update issue fields" do
         click_button "Save"
 
-        page.should_not have_content("Issue ##{@issue.id}")
         page.should have_content @user.name
         page.should have_content "bug 345"
         page.should have_content project.name
@@ -226,7 +224,7 @@ describe "Issues" do
       @issue.save
 
       visit project_issues_path(project)
-      choose 'closed_issues'
+      click_link 'Closed'
       fill_in 'issue_search', :with => 'foobar'
 
       page.should have_content 'foobar'