Commit 01384ca2 authored by Mark Lapierre's avatar Mark Lapierre

Merge branch 'simplify-test-to-make-it-reliable' into 'master'

Simplify test to make it more reliable

See merge request gitlab-org/gitlab!21686
parents 213b70e2 bce385c2
...@@ -45,16 +45,12 @@ module QA ...@@ -45,16 +45,12 @@ module QA
show.select_all_activities_filter show.select_all_activities_filter
initial_labels = "#{initial_label} #{initial_label_multi_colon}"
new_labels = "#{new_label_same_scope} #{new_label_same_scope_multi_colon} #{new_label_different_scope_multi_colon} #{new_label_different_scope}"
expect(page).to have_content("added #{initial_labels}")
expect(page).to have_content("added #{new_labels} scoped labels and automatically removed #{initial_labels}")
expect(show.text_of_labels_block).to have_content(new_label_same_scope) expect(show.text_of_labels_block).to have_content(new_label_same_scope)
expect(show.text_of_labels_block).to have_content(new_label_different_scope) expect(show.text_of_labels_block).to have_content(new_label_different_scope)
expect(show.text_of_labels_block).not_to have_content(initial_label)
expect(show.text_of_labels_block).to have_content(new_label_same_scope_multi_colon) expect(show.text_of_labels_block).to have_content(new_label_same_scope_multi_colon)
expect(show.text_of_labels_block).to have_content(new_label_different_scope_multi_colon) expect(show.text_of_labels_block).to have_content(new_label_different_scope_multi_colon)
expect(show.text_of_labels_block).not_to have_content(initial_label)
expect(show.text_of_labels_block).not_to have_content(initial_label_multi_colon) expect(show.text_of_labels_block).not_to have_content(initial_label_multi_colon)
end 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