Merge branch 'rs-fix-todos-filtering-spec' into 'master'

Improve validity of spec/features/todos/todos_filtering_spec.rb Previously, we were checking that a CSS selector string didn't have some page-related content, which, of course it didn't. Now we check against the actual content of the selector, we use a more semantic selector, and we add an additional expectation for the text that _should_ be there, as an additional sanity check. See merge request !6356

Merge branch 'rs-fix-todos-filtering-spec' into 'master'
f8bd9625 · Rémy Coutable · 44a4274c · e7e628bf · f8bd9625
Commit f8bd9625 authored Sep 15, 2016 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 4 deletions

todos_filtering_spec.rb spec/features/todos/todos_filtering_spec.rb +16 -4

No files found.
--- a/spec/features/todos/todos_filtering_spec.rb
+++ b/spec/features/todos/todos_filtering_spec.rb
@@ -29,8 +29,11 @@ describe 'Dashboard > User filters todos', feature: true, js: true do
      fill_in 'Search projects', with: project_1.name_with_namespace
      click_link project_1.name_with_namespace
    end
+
    wait_for_ajax
-    expect('.prepend-top-default').not_to have_content project_2.name_with_namespace
+
+    expect(page).to     have_content project_1.name_with_namespace
+    expect(page).not_to have_content project_2.name_with_namespace
  end

  it 'filters by author' do
@@ -39,8 +42,11 @@ describe 'Dashboard > User filters todos', feature: true, js: true do
      fill_in 'Search authors', with: user_1.name
      click_link user_1.name
    end
+
    wait_for_ajax
-    expect('.prepend-top-default').not_to have_content user_2.name
+
+    expect(find('.todos-list')).to     have_content user_1.name
+    expect(find('.todos-list')).not_to have_content user_2.name
  end

  it 'filters by type' do
@@ -48,8 +54,11 @@ describe 'Dashboard > User filters todos', feature: true, js: true do
    within '.dropdown-menu-type' do
      click_link 'Issue'
    end
+
    wait_for_ajax
-    expect('.prepend-top-default').not_to have_content ' merge request !'
+
+    expect(find('.todos-list')).to     have_content issue.to_reference
+    expect(find('.todos-list')).not_to have_content merge_request.to_reference
  end

  it 'filters by action' do
@@ -57,7 +66,10 @@ describe 'Dashboard > User filters todos', feature: true, js: true do
    within '.dropdown-menu-action' do
      click_link 'Assigned'
    end
+
    wait_for_ajax
-    expect('.prepend-top-default').not_to have_content ' mentioned '
+
+    expect(find('.todos-list')).to     have_content ' assigned you '
+    expect(find('.todos-list')).not_to have_content ' mentioned '
  end
 end