Commit fd090a2f authored by Rubén Dávila's avatar Rubén Dávila

Fix bug related to filtering Issues by Label/Milestone.

  This problem only was affecting the dev env.
parent 09b7b766
...@@ -42,7 +42,7 @@ module Issuable ...@@ -42,7 +42,7 @@ module Issuable
scope :join_project, -> { joins(:project) } scope :join_project, -> { joins(:project) }
scope :references_project, -> { references(:project) } scope :references_project, -> { references(:project) }
scope :non_archived, -> { join_project.merge(Project.non_archived.only(:where)) } scope :non_archived, -> { join_project.where(projects: { archived: false }) }
delegate :name, delegate :name,
:email, :email,
......
...@@ -6,6 +6,7 @@ Feature: Dashboard ...@@ -6,6 +6,7 @@ Feature: Dashboard
And project "Shop" has push event And project "Shop" has push event
And project "Shop" has CI enabled And project "Shop" has CI enabled
And project "Shop" has CI build And project "Shop" has CI build
And project "Shop" has labels: "bug", "feature", "enhancement"
And I visit dashboard page And I visit dashboard page
Scenario: I should see projects list Scenario: I should see projects list
...@@ -50,6 +51,13 @@ Feature: Dashboard ...@@ -50,6 +51,13 @@ Feature: Dashboard
And I visit dashboard issues page And I visit dashboard issues page
Then The list should be sorted by "Oldest updated" Then The list should be sorted by "Oldest updated"
@javascript
Scenario: Filtering Issues by label
Given project "Shop" has issue "Bugfix1" with label "feature"
When I visit dashboard issues page
And I filter the list by label "feature"
Then I should see "Bugfix1" in issues list
@javascript @javascript
Scenario: Visiting Project's issues after sorting Scenario: Visiting Project's issues after sorting
Given I visit dashboard issues page Given I visit dashboard issues page
......
...@@ -87,4 +87,23 @@ class Spinach::Features::Dashboard < Spinach::FeatureSteps ...@@ -87,4 +87,23 @@ class Spinach::Features::Dashboard < Spinach::FeatureSteps
step 'I should see 1 project at group list' do step 'I should see 1 project at group list' do
expect(find('span.last_activity/span')).to have_content('1') expect(find('span.last_activity/span')).to have_content('1')
end end
step 'I filter the list by label "feature"' do
page.within ".labels-filter" do
find('.dropdown').click
click_link "feature"
end
end
step 'I should see "Bugfix1" in issues list' do
page.within "ul.content-list" do
expect(page).to have_content "Bugfix1"
end
end
step 'project "Shop" has issue "Bugfix1" with label "feature"' do
project = Project.find_by(name: "Shop")
issue = create(:issue, title: "Bugfix1", project: project, assignee: current_user)
issue.labels << project.labels.find_by(title: 'feature')
end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment