Fix tests and unassigned filter for issues. Updated CHANGELOG

6 files changed, 17 insertions, 50 deletions

diff --git a/features/dashboard/issues.feature b/features/dashboard/issues.feature
index 72627e43e05..99dad88a402 100644
--- a/features/dashboard/issues.feature
+++ b/features/dashboard/issues.feature
@@ -10,10 +10,12 @@ Feature: Dashboard Issues
   Scenario: I should see assigned issues
     Then I should see issues assigned to me
 
+  @javascript
   Scenario: I should see authored issues
     When I click "Authored by me" link
     Then I should see issues authored by me
 
+  @javascript
   Scenario: I should see all issues
     When I click "All" link
     Then I should see all issues
diff --git a/features/dashboard/merge_requests.feature b/features/dashboard/merge_requests.feature
index dcef1290e7e..4a2c997d707 100644
--- a/features/dashboard/merge_requests.feature
+++ b/features/dashboard/merge_requests.feature
@@ -10,10 +10,12 @@ Feature: Dashboard Merge Requests
   Scenario: I should see assigned merge_requests
     Then I should see merge requests assigned to me
 
+  @javascript
   Scenario: I should see authored merge_requests
     When I click "Authored by me" link
     Then I should see merge requests authored by me
 
+  @javascript
   Scenario: I should see all merge_requests
     When I click "All" link
     Then I should see all merge requests
diff --git a/features/project/issues/filter_labels.feature b/features/project/issues/filter_labels.feature
index 2c69a78a749..e316f519861 100644
--- a/features/project/issues/filter_labels.feature
+++ b/features/project/issues/filter_labels.feature
@@ -8,11 +8,7 @@ Feature: Project Issues Filter Labels
     And project "Shop" has issue "Feature1" with labels: "feature"
     Given I visit project "Shop" issues page
 
-  Scenario: I should see project issues
-    Then I should see "bug" in labels filter
-    And I should see "feature" in labels filter
-    And I should see "enhancement" in labels filter
-
+  @javascript
   Scenario: I filter by one label
     Given I click link "bug"
     Then I should see "Bugfix1" in issues list
diff --git a/features/steps/dashboard/issues.rb b/features/steps/dashboard/issues.rb
index b77113e3974..60da36e86de 100644
--- a/features/steps/dashboard/issues.rb
+++ b/features/steps/dashboard/issues.rb
@@ -1,6 +1,7 @@
 class Spinach::Features::DashboardIssues < Spinach::FeatureSteps
   include SharedAuthentication
   include SharedPaths
+  include Select2Helper
 
   step 'I should see issues assigned to me' do
     should_see(assigned_issue)
@@ -35,21 +36,13 @@ class Spinach::Features::DashboardIssues < Spinach::FeatureSteps
   end
 
   step 'I click "Authored by me" link' do
-    within ".assignee-filter" do
-      click_link "Any"
-    end
-    within ".author-filter" do
-      click_link current_user.name
-    end
+    select2(current_user.id, from: "#author_id")
+    select2(nil, from: "#assignee_id")
   end
 
   step 'I click "All" link' do
-    within ".author-filter" do
-      click_link "Any"
-    end
-    within ".assignee-filter" do
-      click_link "Any"
-    end
+    select2(nil, from: "#author_id")
+    select2(nil, from: "#assignee_id")
   end
 
   def should_see(issue)
diff --git a/features/steps/dashboard/merge_requests.rb b/features/steps/dashboard/merge_requests.rb
index 6261c89924c..9d92082bb83 100644
--- a/features/steps/dashboard/merge_requests.rb
+++ b/features/steps/dashboard/merge_requests.rb
@@ -1,6 +1,7 @@
 class Spinach::Features::DashboardMergeRequests < Spinach::FeatureSteps
   include SharedAuthentication
   include SharedPaths
+  include Select2Helper
 
   step 'I should see merge requests assigned to me' do
     should_see(assigned_merge_request)
@@ -39,21 +40,13 @@ class Spinach::Features::DashboardMergeRequests < Spinach::FeatureSteps
   end
 
   step 'I click "Authored by me" link' do
-    within ".assignee-filter" do
-      click_link "Any"
-    end
-    within ".author-filter" do
-      click_link current_user.name
-    end
+    select2(current_user.id, from: "#author_id")
+    select2(nil, from: "#assignee_id")
   end
 
   step 'I click "All" link' do
-    within ".author-filter" do
-      click_link "Any"
-    end
-    within ".assignee-filter" do
-      click_link "Any"
-    end
+    select2(nil, from: "#author_id")
+    select2(nil, from: "#assignee_id")
   end
 
   def should_see(merge_request)
diff --git a/features/steps/project/issues/filter_labels.rb b/features/steps/project/issues/filter_labels.rb
index e62fa9c84c8..5740bd12837 100644
--- a/features/steps/project/issues/filter_labels.rb
+++ b/features/steps/project/issues/filter_labels.rb
@@ -2,24 +2,7 @@ class Spinach::Features::ProjectIssuesFilterLabels < Spinach::FeatureSteps
   include SharedAuthentication
   include SharedProject
   include SharedPaths
-
-  step 'I should see "bug" in labels filter' do
-    within ".labels-filter" do
-      page.should have_content "bug"
-    end
-  end
-
-  step 'I should see "feature" in labels filter' do
-    within ".labels-filter" do
-      page.should have_content "feature"
-    end
-  end
-
-  step 'I should see "enhancement" in labels filter' do
-    within ".labels-filter" do
-      page.should have_content "enhancement"
-    end
-  end
+  include Select2Helper
 
   step 'I should see "Bugfix1" in issues list' do
     within ".issues-list" do
@@ -46,9 +29,7 @@ class Spinach::Features::ProjectIssuesFilterLabels < Spinach::FeatureSteps
   end
 
   step 'I click link "bug"' do
-    within ".labels-filter" do
-      click_link "bug"
-    end
+    select2('bug', from: "#label_name")
   end
 
   step 'I click link "feature"' do