diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-10 15:10:26 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-10 15:10:26 +0300 |
commit | 0ecdc32a425d18a762fb7723c2063e864065b571 (patch) | |
tree | 79c0454e7ce3f67dfc13f2cf4098ac51f153b542 /spec | |
parent | d5f14b5e2cef173b377917829b8a494c9975af03 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec')
-rw-r--r-- | spec/frontend/actioncable_link_spec.js | 2 | ||||
-rw-r--r-- | spec/frontend/deploy_freeze/store/mutations_spec.js | 2 | ||||
-rw-r--r-- | spec/frontend/lib/utils/uuids_spec.js (renamed from spec/frontend/diffs/utils/uuids_spec.js) | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/spec/frontend/actioncable_link_spec.js b/spec/frontend/actioncable_link_spec.js index f3e3556f7bb..c785151f8fd 100644 --- a/spec/frontend/actioncable_link_spec.js +++ b/spec/frontend/actioncable_link_spec.js @@ -4,7 +4,7 @@ import cable from '~/actioncable_consumer'; import ActionCableLink from '~/actioncable_link'; // Mock uuids module for determinism -jest.mock('~/diffs/utils/uuids', () => ({ +jest.mock('~/lib/utils/uuids', () => ({ uuids: () => ['testuuid'], })); diff --git a/spec/frontend/deploy_freeze/store/mutations_spec.js b/spec/frontend/deploy_freeze/store/mutations_spec.js index ce75e3b89c3..26c711b0439 100644 --- a/spec/frontend/deploy_freeze/store/mutations_spec.js +++ b/spec/frontend/deploy_freeze/store/mutations_spec.js @@ -27,7 +27,7 @@ describe('Deploy freeze mutations', () => { describe('RECEIVE_FREEZE_PERIODS_SUCCESS', () => { it('should set freeze periods and format timezones from identifiers to names', () => { - const timezoneNames = ['Berlin', 'UTC', 'Eastern Time (US & Canada)']; + const timezoneNames = ['Eastern Time (US & Canada)', 'UTC', 'Berlin']; mutations[types.RECEIVE_FREEZE_PERIODS_SUCCESS](stateCopy, freezePeriodsFixture); diff --git a/spec/frontend/diffs/utils/uuids_spec.js b/spec/frontend/lib/utils/uuids_spec.js index 8d0a01e8cbd..a7770d37566 100644 --- a/spec/frontend/diffs/utils/uuids_spec.js +++ b/spec/frontend/lib/utils/uuids_spec.js @@ -1,4 +1,4 @@ -import { uuids } from '~/diffs/utils/uuids'; +import { uuids } from '~/lib/utils/uuids'; const HEX = /[a-f0-9]/i; const HEX_RE = HEX.source; |