diff options
3 files changed, 8 insertions, 4 deletions
diff --git a/app/assets/javascripts/vue_shared/components/deprecated_modal.vue b/app/assets/javascripts/vue_shared/components/deprecated_modal.vue index d5558d93219..3f55f43edbb 100644 --- a/app/assets/javascripts/vue_shared/components/deprecated_modal.vue +++ b/app/assets/javascripts/vue_shared/components/deprecated_modal.vue @@ -132,6 +132,7 @@ export default { type="button" class="btn js-primary-button" data-dismiss="modal" + data-qa-selector="save_changes_button" @click="emitSubmit($event)" > {{ primaryButtonLabel }} diff --git a/changelogs/unreleased/31427-flaky-spec-finders-members_finder_spec-rb-85.yml b/changelogs/unreleased/31427-flaky-spec-finders-members_finder_spec-rb-85.yml new file mode 100644 index 00000000000..13d4735d2d0 --- /dev/null +++ b/changelogs/unreleased/31427-flaky-spec-finders-members_finder_spec-rb-85.yml @@ -0,0 +1,5 @@ +--- +title: Fix Flaky spec/finders/members_finder_spec.rb:85 +merge_request: 18257 +author: Jacopo Beschi @jacopo-beschi +type: fixed diff --git a/spec/finders/members_finder_spec.rb b/spec/finders/members_finder_spec.rb index 6920fb4e572..5134db96133 100644 --- a/spec/finders/members_finder_spec.rb +++ b/spec/finders/members_finder_spec.rb @@ -86,10 +86,8 @@ describe MembersFinder, '#execute' do create(:project_group_link, project: project, group: nested_linked_group, group_access: Gitlab::Access::REPORTER) nested_linked_group.add_developer(user1) - result = subject - - expect(result).to contain_exactly(linked_group_member, nested_linked_group_member) - expect(result.first.access_level).to eq(Gitlab::Access::REPORTER) + expect(subject.map(&:user)).to contain_exactly(user1, user2) + expect(subject.max_by(&:access_level).access_level).to eq(Gitlab::Access::REPORTER) end end end |