Commit 67264703 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch '33684-foss-master-is-broken-due-to-qa-selectors' into 'master'

Resolve "FOSS `master` is broken due to `qa:selectors`"

Closes #33684

See merge request gitlab-org/gitlab!18315
parents 753b2a58 6f5e9155
......@@ -259,7 +259,6 @@ module QA
module Milestone
autoload :New, 'qa/page/project/milestone/new'
autoload :Index, 'qa/page/project/milestone/index'
autoload :Show, 'qa/page/project/milestone/show'
end
module Operations
......
......@@ -5,18 +5,14 @@ module QA
module Page
module Project
module Milestone
module Show
def self.prepended(page)
page.module_eval do
view 'ee/app/views/shared/milestones/_burndown.html.haml' do
element :burndown_chart
element :weight_button
end
class Show < ::QA::Page::Base
view 'ee/app/views/shared/milestones/_burndown.html.haml' do
element :burndown_chart
element :weight_button
end
view 'ee/app/views/shared/milestones/_weight.html.haml' do
element :total_issue_weight_value
end
end
view 'ee/app/views/shared/milestones/_weight.html.haml' do
element :total_issue_weight_value
end
def click_weight_button
......
# frozen_string_literal: true
module QA
module Page
module Project
module Milestone
class Show < Page::Base
end
end
end
end
end
QA::Page::Project::Milestone::Show.prepend_if_ee('QA::EE::Page::Project::Milestone::Show')
......@@ -33,7 +33,7 @@ module QA
it 'shows burndown chart on milestone page' do
milestone.visit!
Page::Project::Milestone::Show.perform do |show|
QA::EE::Page::Project::Milestone::Show.perform do |show|
expect(show.burndown_chart).to be_visible
expect(show.burndown_chart).to have_content("Open issues")
......
......@@ -41,7 +41,7 @@ module QA
show.click_milestone_link
end
Page::Project::Milestone::Show.perform do |show|
QA::EE::Page::Project::Milestone::Show.perform do |show|
expect(show.total_issue_weight_value).to have_content(weight)
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