diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index eac603ad136767206e47852ee994dad2d266e0ab..bfe01421a33caea386a10d1e4da6ba65c5f415f6 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1033,8 +1033,6 @@ Rails/SaveBang: - 'ee/spec/support/shared_examples/models/member_shared_examples.rb' - 'ee/spec/support/shared_examples/models/mentionable_shared_examples.rb' - 'ee/spec/support/shared_examples/policies/protected_environments_shared_examples.rb' - - 'ee/spec/support/shared_examples/services/build_execute_shared_examples.rb' - - 'ee/spec/support/shared_examples/services/issue_epic_shared_examples.rb' - 'ee/spec/workers/adjourned_project_deletion_worker_spec.rb' - 'ee/spec/workers/clear_shared_runners_minutes_worker_spec.rb' - 'ee/spec/workers/create_github_webhook_worker_spec.rb' @@ -1488,9 +1486,6 @@ Rails/SaveBang: - 'spec/support/shared_examples/quick_actions/issuable/issuable_quick_actions_shared_examples.rb' - 'spec/support/shared_examples/quick_actions/merge_request/merge_quick_action_shared_examples.rb' - 'spec/support/shared_examples/serializers/note_entity_shared_examples.rb' - - 'spec/support/shared_examples/services/common_system_notes_shared_examples.rb' - - 'spec/support/shared_examples/services/issuable_shared_examples.rb' - - 'spec/support/shared_examples/services/wiki_pages/destroy_service_shared_examples.rb' - 'spec/tasks/gitlab/web_hook_rake_spec.rb' - 'spec/uploaders/file_uploader_spec.rb' - 'spec/uploaders/object_storage_spec.rb' diff --git a/app/assets/javascripts/alert_management/constants.js b/app/assets/javascripts/alert_management/constants.js index b9670466c0f448fa82d68edbee809f9f853f6dfb..73cb5ecdf983a7ae5edb9eaaa5da7a7aa50ee2ea 100644 --- a/app/assets/javascripts/alert_management/constants.js +++ b/app/assets/javascripts/alert_management/constants.js @@ -64,4 +64,4 @@ export const trackAlertStatusUpdateOptions = { label: 'Status', }; -export const DEFAULT_PAGE_SIZE = 10; +export const DEFAULT_PAGE_SIZE = 20; diff --git a/app/assets/javascripts/incidents/constants.js b/app/assets/javascripts/incidents/constants.js index 02d8172533d395f99808c8b74224ab7bd9d6757b..42016ed49ddf5f6c3973b7180506a56ae7cb654e 100644 --- a/app/assets/javascripts/incidents/constants.js +++ b/app/assets/javascripts/incidents/constants.js @@ -34,4 +34,4 @@ export const INCIDENT_STATUS_TABS = [ ]; export const INCIDENT_SEARCH_DELAY = 300; -export const DEFAULT_PAGE_SIZE = 10; +export const DEFAULT_PAGE_SIZE = 20; diff --git a/app/assets/javascripts/jobs/components/sidebar.vue b/app/assets/javascripts/jobs/components/sidebar.vue index 54e6fc764faf1b4d3ce9dff9b82dc6f7e15c3235..a6b6a4f1d5f421ced7910bc67ed1ab786d85ae0f 100644 --- a/app/assets/javascripts/jobs/components/sidebar.vue +++ b/app/assets/javascripts/jobs/components/sidebar.vue @@ -4,6 +4,7 @@ import { mapActions, mapState } from 'vuex'; import { GlLink, GlDeprecatedButton, GlIcon } from '@gitlab/ui'; import { __, sprintf } from '~/locale'; import timeagoMixin from '~/vue_shared/mixins/timeago'; +import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate.vue'; import { timeIntervalInWords } from '~/lib/utils/datetime_utility'; import DetailRow from './sidebar_detail_row.vue'; import ArtifactsBlock from './artifacts_block.vue'; @@ -24,6 +25,7 @@ export default { JobsContainer, GlLink, GlDeprecatedButton, + TooltipOnTruncate, }, mixins: [timeagoMixin], props: { @@ -111,7 +113,11 @@ export default {
-

{{ job.name }}

+

+ {{ job.name }} +

+
{ */ export const convertToTitleCase = string => string.replace(/\b[a-z]/g, s => s.toUpperCase()); +const unicodeConversion = [ + [/[ÀÁÂÃÅĀĂĄ]/g, 'A'], + [/[Æ]/g, 'AE'], + [/[ÇĆĈĊČ]/g, 'C'], + [/[ÈÉÊËĒĔĖĘĚ]/g, 'E'], + [/[ÌÍÎÏĨĪĬĮİ]/g, 'I'], + [/[Ððĥħ]/g, 'h'], + [/[ÑŃŅŇʼn]/g, 'N'], + [/[ÒÓÔÕÖØŌŎŐ]/g, 'O'], + [/[ÙÚÛŨŪŬŮŰŲ]/g, 'U'], + [/[ÝŶŸ]/g, 'Y'], + [/[Þñþńņň]/g, 'n'], + [/[ߌŜŞŠ]/g, 'S'], + [/[àáâãåāăąĸ]/g, 'a'], + [/[æ]/g, 'ae'], + [/[çćĉċč]/g, 'c'], + [/[èéêëēĕėęě]/g, 'e'], + [/[ìíîïĩīĭį]/g, 'i'], + [/[òóôõöøōŏő]/g, 'o'], + [/[ùúûũūŭůűų]/g, 'u'], + [/[ýÿŷ]/g, 'y'], + [/[ĎĐ]/g, 'D'], + [/[ďđ]/g, 'd'], + [/[ĜĞĠĢ]/g, 'G'], + [/[ĝğġģŊŋſ]/g, 'g'], + [/[ĤĦ]/g, 'H'], + [/[ıśŝşš]/g, 's'], + [/[IJ]/g, 'IJ'], + [/[ij]/g, 'ij'], + [/[Ĵ]/g, 'J'], + [/[ĵ]/g, 'j'], + [/[Ķ]/g, 'K'], + [/[ķ]/g, 'k'], + [/[ĹĻĽĿŁ]/g, 'L'], + [/[ĺļľŀł]/g, 'l'], + [/[Œ]/g, 'OE'], + [/[œ]/g, 'oe'], + [/[ŔŖŘ]/g, 'R'], + [/[ŕŗř]/g, 'r'], + [/[ŢŤŦ]/g, 'T'], + [/[ţťŧ]/g, 't'], + [/[Ŵ]/g, 'W'], + [/[ŵ]/g, 'w'], + [/[ŹŻŽ]/g, 'Z'], + [/[źżž]/g, 'z'], + [/ö/g, 'oe'], + [/ü/g, 'ue'], + [/ä/g, 'ae'], + // eslint-disable-next-line @gitlab/require-i18n-strings + [/Ö/g, 'Oe'], + // eslint-disable-next-line @gitlab/require-i18n-strings + [/Ü/g, 'Ue'], + // eslint-disable-next-line @gitlab/require-i18n-strings + [/Ä/g, 'Ae'], +]; + +/** + * Converts each non-ascii character in a string to + * it's ascii equivalent (if defined). + * + * e.g. "Dĭd söméònê äšk fœŕ Ůnĭċődę?" => "Did someone aesk foer Unicode?" + * + * @param {String} string + * @returns {String} + */ +export const convertUnicodeToAscii = string => { + let convertedString = string; + + unicodeConversion.forEach(([regex, replacer]) => { + convertedString = convertedString.replace(regex, replacer); + }); + + return convertedString; +}; + /** * Splits camelCase or PascalCase words * e.g. HelloWorld => Hello World diff --git a/app/assets/javascripts/projects/project_new.js b/app/assets/javascripts/projects/project_new.js index ec0a83b5736c6194669ac5bbb9ff28204bd68130..599aa52831bb8cb323167e4b905b726fffbf2de8 100644 --- a/app/assets/javascripts/projects/project_new.js +++ b/app/assets/javascripts/projects/project_new.js @@ -1,13 +1,18 @@ import $ from 'jquery'; import DEFAULT_PROJECT_TEMPLATES from 'ee_else_ce/projects/default_project_templates'; import { addSelectOnFocusBehaviour } from '../lib/utils/common_utils'; -import { convertToTitleCase, humanize, slugify } from '../lib/utils/text_utility'; +import { + convertToTitleCase, + humanize, + slugify, + convertUnicodeToAscii, +} from '../lib/utils/text_utility'; let hasUserDefinedProjectPath = false; let hasUserDefinedProjectName = false; const onProjectNameChange = ($projectNameInput, $projectPathInput) => { - const slug = slugify($projectNameInput.val()); + const slug = slugify(convertUnicodeToAscii($projectNameInput.val())); $projectPathInput.val(slug); }; diff --git a/app/assets/javascripts/vue_shared/components/tooltip_on_truncate.vue b/app/assets/javascripts/vue_shared/components/tooltip_on_truncate.vue index 4ea3d162da2ea69c797eca48c90385624a7c1e5f..579ad53e6db1fe5ab936a27a2e8bc73fc9a4c58d 100644 --- a/app/assets/javascripts/vue_shared/components/tooltip_on_truncate.vue +++ b/app/assets/javascripts/vue_shared/components/tooltip_on_truncate.vue @@ -61,9 +61,9 @@ export default { v-tooltip :title="title" :data-placement="placement" - class="js-show-tooltip" + class="js-show-tooltip gl-min-w-0" > - + diff --git a/changelogs/unreleased/230452-truncate-job-title.yml b/changelogs/unreleased/230452-truncate-job-title.yml new file mode 100644 index 0000000000000000000000000000000000000000..91324a83f5f96318f4ababb68d2a83f3c2b6b177 --- /dev/null +++ b/changelogs/unreleased/230452-truncate-job-title.yml @@ -0,0 +1,5 @@ +--- +title: Truncate job title on log page +merge_request: 40107 +author: +type: changed diff --git a/changelogs/unreleased/239355-alert-incident-count.yml b/changelogs/unreleased/239355-alert-incident-count.yml new file mode 100644 index 0000000000000000000000000000000000000000..61776dc189d670157efc8969371e58a1ff77bdcd --- /dev/null +++ b/changelogs/unreleased/239355-alert-incident-count.yml @@ -0,0 +1,5 @@ +--- +title: Increase default page size for Alert and Incident management to 20 from 10 +merge_request: 40139 +author: +type: changed diff --git a/changelogs/unreleased/29642-Replace-Unicode-with-ASCII-Equivalent.yml b/changelogs/unreleased/29642-Replace-Unicode-with-ASCII-Equivalent.yml new file mode 100644 index 0000000000000000000000000000000000000000..bcdb855ea19a85c327ef380beedb40a0b5b24515 --- /dev/null +++ b/changelogs/unreleased/29642-Replace-Unicode-with-ASCII-Equivalent.yml @@ -0,0 +1,5 @@ +--- +title: Replace Unicode Characters with ASCII Equivalent in New Project Slug +merge_request: 39971 +author: Kev @KevSlashNull +type: changed diff --git a/changelogs/unreleased/rails-save-bang-13.yml b/changelogs/unreleased/rails-save-bang-13.yml new file mode 100644 index 0000000000000000000000000000000000000000..16c61a9201ba0f40941e1cb6b64af564ef9918b6 --- /dev/null +++ b/changelogs/unreleased/rails-save-bang-13.yml @@ -0,0 +1,5 @@ +--- +title: Refactor spec/support/shared_examples/services/* and ee/spec/support/shared_examples/services/* to fix Rails/SaveBang Cop +merge_request: 39538 +author: Rajendra Kadam +type: fixed diff --git a/doc/development/testing_guide/frontend_testing.md b/doc/development/testing_guide/frontend_testing.md index 83d030974665250b3c288de3d135b8cb1ba07e67..1813618415e3fcea3e76ebb7bbdaef4098d8b3b2 100644 --- a/doc/development/testing_guide/frontend_testing.md +++ b/doc/development/testing_guide/frontend_testing.md @@ -321,80 +321,56 @@ it('tests a promise', async () => { }); it('tests a promise rejection', async () => { - expect.assertions(1); - try { - await user.getUserName(1); - } catch (e) { - expect(e).toEqual({ - error: 'User with 1 not found.', - }); - } + await expect(user.getUserName(1)).rejects.toThrow('User with 1 not found.'); }); ``` -You can also work with Promise chains. In this case, you can make use of the `done` callback and `done.fail` in case an error occurred. Following are some examples: +You can also simply return a promise from the test function. + +NOTE: **Note:** +Using the `done` and `done.fail` callbacks is discouraged when working with +promises. They should only be used when testing callback-based code. **Bad**: ```javascript -// missing done callback +// missing return it('tests a promise', () => { promise.then(data => { expect(data).toBe(asExpected); }); }); -// missing catch -it('tests a promise', done => { - promise - .then(data => { - expect(data).toBe(asExpected); - }) - .then(done); -}); - -// use done.fail in asynchronous tests +// uses done/done.fail it('tests a promise', done => { promise .then(data => { expect(data).toBe(asExpected); }) .then(done) - .catch(fail); -}); - -// missing catch -it('tests a promise rejection', done => { - promise - .catch(error => { - expect(error).toBe(expectedError); - }) - .then(done); + .catch(done.fail); }); ``` **Good**: ```javascript -// handling success -it('tests a promise', done => { - promise +// verifying a resolved promise +it('tests a promise', () => { + return promise .then(data => { expect(data).toBe(asExpected); - }) - .then(done) - .catch(done.fail); + }); }); -// failure case -it('tests a promise rejection', done => { - promise - .then(done.fail) - .catch(error => { - expect(error).toBe(expectedError); - }) - .then(done) - .catch(done.fail); +// verifying a resolved promise using Jest's `resolves` matcher +it('tests a promise', () => { + return expect(promise).resolves.toBe(asExpected); +}); + +// verifying a rejected promise using Jest's `rejects` matcher +it('tests a promise rejection', () => { + return expect(promise).rejects.toThrow(expectedError); }); ``` diff --git a/qa/qa/support/json_formatter.rb b/qa/qa/support/json_formatter.rb index 5d2a3e7b75f43ca49b0bd42b691389b684f52439..0c3ab63dce075ce01cc15457a03652d14079468e 100644 --- a/qa/qa/support/json_formatter.rb +++ b/qa/qa/support/json_formatter.rb @@ -35,13 +35,15 @@ module QA private def format_example(example) + file_path, line_number = location_including_shared_examples(example.metadata) + { id: example.id, description: example.description, full_description: example.full_description, status: example.execution_result.status.to_s, - file_path: example.metadata[:file_path], - line_number: example.metadata[:line_number], + file_path: file_path, + line_number: line_number.to_i, run_time: example.execution_result.run_time, pending_message: example.execution_result.pending_message, status_issue: example.metadata[:status_issue], @@ -49,6 +51,15 @@ module QA screenshot: example.metadata[:screenshot] } end + + def location_including_shared_examples(metadata) + if metadata[:shared_group_inclusion_backtrace].empty? + [metadata[:file_path], metadata[:line_number]] + else + # If there are nested shared examples, the outermost location is last in the array + metadata[:shared_group_inclusion_backtrace].last.formatted_inclusion_location.split(':') + end + end end end end diff --git a/spec/frontend/alert_management/components/alert_management_table_spec.js b/spec/frontend/alert_management/components/alert_management_table_spec.js index 926207ef4a103fcc28b4b21cd3f9bfb55d0a83d1..a9ee47bf26964ad2f9ae7091a09b464cef02b6c2 100644 --- a/spec/frontend/alert_management/components/alert_management_table_spec.js +++ b/spec/frontend/alert_management/components/alert_management_table_spec.js @@ -49,11 +49,11 @@ describe('AlertManagementTable', () => { const findIssueFields = () => wrapper.findAll('[data-testid="issueField"]'); const findAlertError = () => wrapper.find('[data-testid="alert-error"]'); const alertsCount = { - open: 14, - triggered: 10, - acknowledged: 6, - resolved: 1, - all: 16, + open: 24, + triggered: 20, + acknowledged: 16, + resolved: 11, + all: 26, }; const selectFirstStatusOption = () => { findFirstStatusOption().vm.$emit('click'); diff --git a/spec/frontend/incidents/components/incidents_list_spec.js b/spec/frontend/incidents/components/incidents_list_spec.js index 33ddd06d6d9430d29a4240cde3c066ab8def6793..a80c9c25dbf14a42e25f16e5da405f7073f4289a 100644 --- a/spec/frontend/incidents/components/incidents_list_spec.js +++ b/spec/frontend/incidents/components/incidents_list_spec.js @@ -30,9 +30,9 @@ describe('Incidents List', () => { const incidentTemplateName = 'incident'; const incidentType = 'incident'; const incidentsCount = { - opened: 14, - closed: 1, - all: 16, + opened: 24, + closed: 10, + all: 26, }; const findTable = () => wrapper.find(GlTable); diff --git a/spec/frontend/lib/utils/text_utility_spec.js b/spec/frontend/lib/utils/text_utility_spec.js index 285f7d04c3b62642725b6f98124631fd511eb79f..2b88de3a77677809c38f743f530544bbfd06b95d 100644 --- a/spec/frontend/lib/utils/text_utility_spec.js +++ b/spec/frontend/lib/utils/text_utility_spec.js @@ -205,6 +205,26 @@ describe('text_utility', () => { }); }); + describe('convertUnicodeToAscii', () => { + it('does nothing on an empty string', () => { + expect(textUtils.convertUnicodeToAscii('')).toBe(''); + }); + + it('does nothing on an already ascii string', () => { + expect(textUtils.convertUnicodeToAscii('The quick brown fox jumps over the lazy dog.')).toBe( + 'The quick brown fox jumps over the lazy dog.', + ); + }); + + it('replaces Unicode characters', () => { + expect(textUtils.convertUnicodeToAscii('Dĭd söméònê äšk fœŕ Ůnĭċődę?')).toBe( + 'Did someone aesk foer Unicode?', + ); + + expect(textUtils.convertUnicodeToAscii("Jürgen's Projekt")).toBe("Juergen's Projekt"); + }); + }); + describe('splitCamelCase', () => { it('separates a PascalCase word to two', () => { expect(textUtils.splitCamelCase('HelloWorld')).toBe('Hello World'); diff --git a/spec/support/shared_examples/services/common_system_notes_shared_examples.rb b/spec/support/shared_examples/services/common_system_notes_shared_examples.rb index 20856b05de6ad7128b874bf0e48e000655f5ec50..5b95a5753a196d8654852617ee3b18dd777378ea 100644 --- a/spec/support/shared_examples/services/common_system_notes_shared_examples.rb +++ b/spec/support/shared_examples/services/common_system_notes_shared_examples.rb @@ -5,7 +5,7 @@ RSpec.shared_examples 'system note creation' do |update_params, note_text| before do issuable.assign_attributes(update_params) - issuable.save + issuable.save! end it 'creates 1 system note with the correct content' do diff --git a/spec/support/shared_examples/services/issuable_shared_examples.rb b/spec/support/shared_examples/services/issuable_shared_examples.rb index 9eb66e33513bac25ae8b6a2cd89e17fee19d644a..dd866c0a8dc7d38cceb01165255a4d0d12b8d272 100644 --- a/spec/support/shared_examples/services/issuable_shared_examples.rb +++ b/spec/support/shared_examples/services/issuable_shared_examples.rb @@ -19,7 +19,7 @@ RSpec.shared_examples 'system notes for milestones' do let(:group_milestone) { create(:milestone, group: group) } before do - project.update(namespace: group) + project.update!(namespace: group) create(:group_member, group: group, user: user) end diff --git a/spec/support/shared_examples/services/wiki_pages/destroy_service_shared_examples.rb b/spec/support/shared_examples/services/wiki_pages/destroy_service_shared_examples.rb index 232e8d29ec4d1c49ba6a11f8fb3779367d6a6839..ffdd0c36cfc790798c340b0bd9e2b1df685b4640 100644 --- a/spec/support/shared_examples/services/wiki_pages/destroy_service_shared_examples.rb +++ b/spec/support/shared_examples/services/wiki_pages/destroy_service_shared_examples.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true RSpec.shared_examples 'WikiPages::DestroyService#execute' do |container_type| - let(:container) { create(container_type) } + let(:container) { create(container_type) } # rubocop:disable Rails/SaveBang let(:user) { create(:user) } let(:page) { create(:wiki_page) }