Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-12-27 20:07:29 +0300
committerFilipa Lacerda <filipa@gitlab.com>2017-12-27 20:07:29 +0300
commitf1d5e509b52c8c05fd570503389930121e12d87f (patch)
treedd6a7964aa43102115b44319a516f6074c857c2a /spec
parentff3e9af6fdac37ae71ea526bbb9aaf4b7d2ce876 (diff)
parentf102e45a196eaa2a59fb92157d04e22736805ad0 (diff)
Merge branch 'sh-make-kib-human' into 'master'
Humanize the units of "Showing last X KiB of log" in job trace Closes #38613 See merge request gitlab-org/gitlab-ce!16147
Diffstat (limited to 'spec')
-rw-r--r--spec/javascripts/job_spec.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/javascripts/job_spec.js b/spec/javascripts/job_spec.js
index 4f06237deb5..b740c9ed893 100644
--- a/spec/javascripts/job_spec.js
+++ b/spec/javascripts/job_spec.js
@@ -1,4 +1,4 @@
-import { bytesToKiB } from '~/lib/utils/number_utils';
+import { numberToHumanSize } from '~/lib/utils/number_utils';
import * as urlUtils from '~/lib/utils/url_utility';
import '~/lib/utils/datetime_utility';
import Job from '~/job';
@@ -169,7 +169,7 @@ describe('Job', () => {
expect(
document.querySelector('.js-truncated-info-size').textContent.trim(),
- ).toEqual(`${bytesToKiB(size)}`);
+ ).toEqual(`${numberToHumanSize(size)}`);
});
it('shows incremented size', () => {
@@ -195,7 +195,7 @@ describe('Job', () => {
expect(
document.querySelector('.js-truncated-info-size').textContent.trim(),
- ).toEqual(`${bytesToKiB(50)}`);
+ ).toEqual(`${numberToHumanSize(50)}`);
jasmine.clock().tick(4001);
@@ -209,7 +209,7 @@ describe('Job', () => {
expect(
document.querySelector('.js-truncated-info-size').textContent.trim(),
- ).toEqual(`${bytesToKiB(60)}`);
+ ).toEqual(`${numberToHumanSize(60)}`);
});
it('renders the raw link', () => {