rewrite issues search test to prevent ajax requests running after test

2 files changed, 15 insertions, 18 deletions

diff --git a/features/project/issues/issues.feature b/features/project/issues/issues.feature
index 5db9e01068c..67986784bc7 100644
--- a/features/project/issues/issues.feature
+++ b/features/project/issues/issues.feature
@@ -3,7 +3,7 @@ Feature: Project Issues
     Given I sign in as a user
     And I own project "Shop"
     And project "Shop" have "Release 0.4" open issue
-    And project "Shop" have "Tweet feature" open issue
+    And project "Shop" have "Tweet control" open issue
     And project "Shop" have "Release 0.3" closed issue
     And I visit project "Shop" issues page
 
@@ -38,20 +38,20 @@ Feature: Project Issues
 
   @javascript
   Scenario: I search issue
-    Given I fill in issue search with "Release"
+    Given I fill in issue search with "Re"
     Then I should see "Release 0.4" in issues
     And I should not see "Release 0.3" in issues
-    And I should not see "Tweet feature" in issues
+    And I should not see "Tweet control" in issues
 
   @javascript
   Scenario: I search issue that not exist
-    Given I fill in issue search with "Bug"
+    Given I fill in issue search with "Bu"
     Then I should not see "Release 0.4" in issues
     And I should not see "Release 0.3" in issues
 
   @javascript
   Scenario: I search all issues
     Given I click link "All"
-    And I fill in issue search with "0.3"
+    And I fill in issue search with ".3"
     Then I should see "Release 0.3" in issues
     And I should not see "Release 0.4" in issues
diff --git a/features/steps/project/project_issues.rb b/features/steps/project/project_issues.rb
index 70c9b3a3f2e..801fff78a52 100644
--- a/features/steps/project/project_issues.rb
+++ b/features/steps/project/project_issues.rb
@@ -12,8 +12,8 @@ class ProjectIssues < Spinach::FeatureSteps
     page.should_not have_content "Release 0.3"
   end
 
-  And 'I should not see "Tweet feature" in issues' do
-    page.should_not have_content "Tweet feature"
+  And 'I should not see "Tweet control" in issues' do
+    page.should_not have_content "Tweet control"
   end
 
   Given 'I click link "Closed"' do
@@ -60,19 +60,16 @@ class ProjectIssues < Spinach::FeatureSteps
     page.should have_content issue.project.name
   end
 
-  Given 'I fill in issue search with "Release"' do
-    fill_in 'issue_search', with: "Release"
-    sleep 0.05
+  Given 'I fill in issue search with "Re"' do
+    fill_in 'issue_search', with: "Re"
   end
 
-  Given 'I fill in issue search with "Bug"' do
-    fill_in 'issue_search', with: "Bug"
-    sleep 0.05
+  Given 'I fill in issue search with "Bu"' do
+    fill_in 'issue_search', with: "Bu"
   end
 
-  And 'I fill in issue search with "0.3"' do
-    fill_in 'issue_search', with: "0.3"
-    sleep 0.05
+  And 'I fill in issue search with ".3"' do
+    fill_in 'issue_search', with: ".3"
   end
 
   And 'I fill in issue search with "Something"' do
@@ -127,10 +124,10 @@ class ProjectIssues < Spinach::FeatureSteps
            author: project.users.first)
   end
 
-  And 'project "Shop" have "Tweet feature" open issue' do
+  And 'project "Shop" have "Tweet control" open issue' do
     project = Project.find_by_name("Shop")
     create(:issue,
-           title: "Tweet feature",
+           title: "Tweet control",
            project: project,
            author: project.users.first)
   end