Commit c9e7ae15 authored by Thong Kuah's avatar Thong Kuah

Merge branch '32620-avoid-design-filename-collisions' into 'master'

Fix design flaky specs

See merge request gitlab-org/gitlab!17654
parents 85109c4e 5c37c7ba
......@@ -9,8 +9,7 @@ describe 'User paginates issue designs', :js do
before do
enable_design_management
create(:design, :with_file, issue: issue, filename: 'world.png')
create(:design, :with_file, issue: issue, filename: 'dk.png')
create_list(:design, 2, :with_file, issue: issue)
visit project_issue_path(project, issue)
......
......@@ -5,12 +5,11 @@ describe 'User views issue designs', :js do
set(:project) { create(:project_empty_repo, :public) }
set(:issue) { create(:issue, project: project) }
set(:design) { create(:design, :with_file, issue: issue) }
before do
enable_design_management
create(:design, :with_file, issue: issue, filename: 'world.png')
visit project_issue_path(project, issue)
click_link 'Designs'
......@@ -22,7 +21,7 @@ describe 'User views issue designs', :js do
find('.js-design-list-item', match: :first).click
page.within(find('.js-design-header')) do
expect(page).to have_content('world.png')
expect(page).to have_content(design.filename)
end
expect(page).to have_selector('.js-design-image')
......
......@@ -5,11 +5,10 @@ describe 'User views issue designs', :js do
set(:project) { create(:project_empty_repo, :public) }
set(:issue) { create(:issue, project: project) }
set(:design) { create(:design, :with_file, issue: issue) }
before do
enable_design_management
create(:design, :with_file, issue: issue)
end
context 'navigates from the issue view' do
......
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