Skip to content

Fix pipeline 1178776

路志远请求将fix-pipeline-1178776合并到main-jh

What does this MR do and why?

Fix pipeline: https://jihulab.com/gitlab-cn/gitlab/-/pipelines/1178776

1. https://jihulab.com/gitlab-cn/gitlab/-/jobs/7536315 & https://jihulab.com/gitlab-cn/gitlab/-/jobs/7536379

Fixed in !1610 (1820bb1a) (owner: @orozot )

Custom URLs Subscription Portal subscription_portal_url when CUSTOMER_PORTAL_URL ENV is unset test: false, development: false, expected_url: "https://customers.jihulab.com" is expected to eq "https://customers.jihulab.com"
     Failure/Error: it { is_expected.to eq(expected_url) }
       expected: "https://customers.jihulab.com"
            got: "https://customers.gitlab.com"
       (compared using ==)
     # ./spec/routing/directs/subscription_portal_spec.rb:47:in `block (5 levels) in <main>'

2. https://jihulab.com/gitlab-cn/gitlab/-/jobs/7536394

Fix commit: !1610 (437c97e9) (owner: @luzhiyuan.deer )

1) TrialsController POST create_lead when authenticated with create service failures when lead creation fails renders lead form
     Failure/Error: expect(response.body).to include('Your GitLab Ultimate trial lasts for 30 days')
       expected "<!DOCTYPE html>\...

3. https://jihulab.com/gitlab-cn/gitlab/-/jobs/7536401

Fix commit: !1610 (c7f75734) (owner: @luzhiyuan.deer )

1) Standard flow for user picking company and creating a project when user in automatic_trial_registration experiment registers the user and creates a group and project reaching onboarding
     Got 1 failure and 1 other error:
     1.1) Failure/Error: expect(page).to have_content 'Your GitLab Ultimate free trial lasts for 30 days.'
            expected to find text "Your GitLab Ultimate free trial lasts for 30 days." in "About your company To complete registration,...

4. https://jihulab.com/gitlab-cn/gitlab/-/jobs/7536409

undefined method `subscriptions_more_minutes_url'

Fix commit: !1610 (163a1fb7) (owner: @luzhiyuan.deer )

uninitialized constant EE::SUBSCRIPTIONS_URL

Fix commit: !1610 (3a1c248d) (owner: @luzhiyuan.deer )

expected to find visible field "Phone" that is not disabled with value "13696145324" but there were no matches. Also found "", which matched the selector but not all filters. Expected value to be "13696145324" but was "WP0iY2jP8irp5XEPfUh8Xt1wcLRlbxR9XlJxfcSN"

Fix commit: !1610 (bdfe4965) (owner: @icbd )

5. https://jihulab.com/gitlab-cn/gitlab/-/jobs/7536377

Fix commit: !1610 (f6ad4843) (owner: @luzhiyuan.deer )

Failures:
  1) groups/billings/index when the group is the top level with free plan renders the billing page
     Failure/Error: expect(rendered).to have_link('Start a free Ultimate trial', href: new_trial_path(namespace_id: group.id))
       expected to find link "Start a free Ultimate trial" with href "/-/trials/new?namespace_id=4084" but there were no matches
     # ./ee/spec/views/groups/billings/index.html.haml_spec.rb:52:in `block (4 levels) in <main>'

6. https://jihulab.com/gitlab-cn/gitlab/-/jobs/7536408

Fix commit: !1610 (a086fb20) (owner: @songhuang )

62 examples, 62 failures
...
rspec ./jh/spec/requests/api/integrations/dingtalk_spec.rb
rspec ./jh/spec/requests/api/integrations/feishu_bot_spec.rb

7. https://jihulab.com/gitlab-cn/gitlab/-/jobs/7536376

Fix commit： !1610 (74da3713) (owner: @HiveerLi )

8. https://jihulab.com/gitlab-cn/gitlab/-/jobs/7536372

Fix commit： !1610 (74da3713) (owner: @HiveerLi )

9. https://jihulab.com/gitlab-cn/gitlab/-/jobs/7536407

undefined method `subscriptions_more_minutes_url' for Gitlab::SubscriptionPortal:Module

Fix commit: !1610 (2eb3ffba) (owner: @luzhiyuan.deer )

expected: ("# frozen_string_literal: true\n\nresources :provinces, only: [:index]\n") got: ("# frozen_string_literal: true\n\nresources :provinces, only: [:index]\n", "/builds/gitlab-cn/gitlab/jh/config/routes/province.rb")

  1. Gitlab::Patch::DrawRoute evaluates JH only routes Failure/Error: expect(subject).to have_received(:instance_eval) .with(File.read(subject.route_path('jh/config/routes/province.rb'))) .once

Fix commit: !1610 (53509fb2) (owner: @HiveerLi )

expected: "/-/trials/create_lead?utm_keyword=jihukaiyuan&utm_medium=pinpaici-PC&utm_source=baidu" got: "/-/trials/create_lead?step=lead&utm_keyword=jihukaiyuan&utm_medium=pinpaici-PC&utm_source=baidu"

Fix commit: !1610 (dad1a126) (owner: @luzhiyuan.deer )

expected: ("# frozen_string_literal: true\n\nresources :provinces, only: [:index]\n") got: ("# frozen_string_literal: true\n\nresources :provinces, only: [:index]\n", "/builds/gitlab-cn/gitlab/jh/config/routes/province.rb")

Fix commit: !1610 (74da3713) (owner: @HiveerLi )

Screenshots or screen recordings

Screenshots are required for UI changes, and strongly recommended for all other merge requests.

How to set up and validate locally

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

由 路志远 编辑于

合并请求报告