[QA] Use public_email instead of email since it's available
What does this MR do?
This makes sure we fetch public_email
from the response API instead of email
which is only available to admins.
This also add tests for the User
resource.
What are the relevant issue numbers?
Closes gitlab-org/quality/staging#27 (closed).
Does this MR meet the acceptance criteria?
- [-] Changelog entry added, if necessary
- [-] Documentation created/updated via this MR
- [-] Documentation reviewed by technical writer or follow-up review issue created
-
Tests added for this feature/bug - [-] Tested in all supported browsers
-
Conforms to the code review guidelines -
Conforms to the merge request performance guidelines -
Conforms to the style guides -
Conforms to the database guides - [-] Link to e2e tests MR added if this MR has Requires e2e tests label. See the Test Planning Process.
-
Security reports checked/validated by reviewer
Merge request reports
Activity
changed milestone to %11.8
added 1 commit
- dcef762c - [QA] Use public_email instead of email since it's available
1 Warning cbc3d1f9: This commit’s subject line is acceptable, but please try to reduce it to 50 characters. Generated by
DangerEdited by 🤖 GitLab Bot 🤖@mlapierre Could you please review? Thanks!
assigned to @mlapierre
- Resolved by Rémy Coutable
- Resolved by Rémy Coutable
- Resolved by Rémy Coutable
- Resolved by Rémy Coutable
- Resolved by Rémy Coutable
- Resolved by Rémy Coutable
Thanks for making these changes @rymai! I left a few minor comments, mostly really just nit-picks. But the test also failed, presumably because
public_email
isn't actually set for the root user.assigned to @rymai
added 42 commits
-
dcef762c...1077328b - 41 commits from branch
master
- 806f97e7 - [QA] Use public_email instead of email since it's available
-
dcef762c...1077328b - 41 commits from branch
@mlapierre Thanks for the review, I think I addressed everything, I've started the
review-qa-all
job here: https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/149344796assigned to @mlapierre
@rymai So close!
2) Create Commit data user views raw email patch Failure/Error: expect(page).to have_content("From: #{user.name} <#{user.public_email}>") expected to find text "From: Administrator <root@example.com>" in "From c7483faa94b32bc5afae9862eca19edd6288727d Mon Sep 17 00:00:00 2001 From: Administrator <admin@example.com> Date: Tue, 22 Jan 2019 14:40:41 +0000 Subject: [PATCH] Add second file --- second | 1 + 1 file changed, 1 insertion(+) create mode 100644 second diff --git a/second b/second new file mode 100644 index 0000000..df514d3 --- /dev/null +++ b/second @@ -0,0 +1 @@ +second file content \\ No newline at end of file -- 2.18.1" # ./qa/specs/features/browser_ui/3_create/repository/user_views_raw_diff_patch_requests_spec.rb:50:in `block (3 levels) in <module:QA>'
Hmm, I didn't notice before that the expected email address is
admin@example.com
. That doesn't seem right?assigned to @rymai
@rymai FYI I restarted the
review-deploy
job. But if there is a better way I'd be keen to try that first next time.The review app isn't responding now and some of the workloads are showing errors or warnings. Do you know if it's possible to restart those workloads, or would we need to restart the whole
review-deploy
job?Yes, sorry, I've changed the node pools configuration because some pods weren't schedulable, that may be the cause...
FYI I restarted the
review-deploy
job. But if there is a better way I'd be keen to try that first next time.Yeah, that should solve it.
Hmm, I didn't notice before that the expected email address is
admin@example.com
. That doesn't seem right?@mlapierre That's the default in https://gitlab.com/gitlab-org/gitlab-ce/blob/7363428c0928b14bfd8c85a2a16d0f36622db747/db/fixtures/production/002_admin.rb#L2 so I guess we should make it the default in QA too... I think I will add
default_email
toQA::Runtime::User
and default to that inResource::User
, WDYT?That's the default in https://gitlab.com/gitlab-org/gitlab-ce/blob/7363428c0928b14bfd8c85a2a16d0f36622db747/db/fixtures/production/002_admin.rb#L2 so I guess we should make it the default in QA too... I think I will add
default_email
toQA::Runtime::User
and default to that inResource::User
, WDYT?Yup, sounds good to me!
...and I guessadmin
is more common in an email address thanroot
, so it does make sense.added 43 commits
-
806f97e7...b061e896 - 42 commits from branch
master
- 55884e22 - [QA] Use public_email instead of email since it's available
-
806f97e7...b061e896 - 42 commits from branch
@mlapierre I've implemented
Runtime::User.default_email
as discussed. Please have another look!assigned to @mlapierre
assigned to @rymai
added 46 commits
-
55884e22...da251c64 - 45 commits from branch
master
- a628859e - [QA] Use public_email instead of email since it's available
-
55884e22...da251c64 - 45 commits from branch
added 5 commits
-
a628859e...cae2330b - 4 commits from branch
master
- cbc3d1f9 - [QA] Use public_email instead of email since it's available
-
a628859e...cae2330b - 4 commits from branch
The
package-and-qa
job from pipeline https://gitlab.com/gitlab-org/gitlab-ce/pipelines/44468872 triggered https://gitlab.com/gitlab-org/omnibus-gitlab/pipelines/44474238 downstream.The
Trigger:qa-test
job from pipeline https://gitlab.com/gitlab-org/omnibus-gitlab/pipelines/44474238 triggered https://gitlab.com/gitlab-org/gitlab-qa/pipelines/44480613 downstream.The
gitlab-qa
downstream pipeline failed!
@mlapierre QA is
(the failure is unrelated). Please have another look, thanks!assigned to @mlapierre
Looks good, thanks @rymai!
mentioned in commit 19add921
changed milestone to %11.7
mentioned in commit 58ec656b
mentioned in commit BastienDurel/gitlab-ce@912773af
Automatically picked into https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24941, will merge into
11-7-stable
ready for11.7.5
.mentioned in commit cf47f170
mentioned in merge request !24941 (merged)
mentioned in issue #60350 (moved)