summaryrefslogtreecommitdiff
path: root/spec/frontend
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-06-30 21:09:47 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-06-30 21:09:47 +0000
commitb1c4066c6b06ddb9928cf5d76eead4df7fa19258 (patch)
tree19c9a7087956d851e4ddef3670ac1b81c22fad17 /spec/frontend
parent79040c61789cf767f8a232b1b9ecc0dc557d76cb (diff)
downloadgitlab-ce-b1c4066c6b06ddb9928cf5d76eead4df7fa19258.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend')
-rw-r--r--spec/frontend/lib/utils/grammar_spec.js12
1 files changed, 6 insertions, 6 deletions
diff --git a/spec/frontend/lib/utils/grammar_spec.js b/spec/frontend/lib/utils/grammar_spec.js
index 377b2ffb48c..7f2431af7ed 100644
--- a/spec/frontend/lib/utils/grammar_spec.js
+++ b/spec/frontend/lib/utils/grammar_spec.js
@@ -7,27 +7,27 @@ describe('utils/grammar', () => {
});
it('with single item returns item', () => {
- const items = ['Lorem Ipsum'];
+ const items = ['Lorem & Ipsum'];
expect(grammar.toNounSeriesText(items)).toBe(items[0]);
});
it('with 2 items returns item1 and item2', () => {
- const items = ['Dolar', 'Sit Amit'];
+ const items = ['Dolar', 'Sit & Amit'];
expect(grammar.toNounSeriesText(items)).toBe(`${items[0]} and ${items[1]}`);
});
it('with 3 items returns comma separated series', () => {
- const items = ['Lorem', 'Ipsum', 'dolar'];
- const expected = 'Lorem, Ipsum, and dolar';
+ const items = ['Lorem', 'Ipsum', 'Sit & Amit'];
+ const expected = 'Lorem, Ipsum, and Sit & Amit';
expect(grammar.toNounSeriesText(items)).toBe(expected);
});
it('with 6 items returns comma separated series', () => {
- const items = ['Lorem', 'ipsum', 'dolar', 'sit', 'amit', 'consectetur'];
- const expected = 'Lorem, ipsum, dolar, sit, amit, and consectetur';
+ const items = ['Lorem', 'ipsum', 'dolar', 'sit', 'amit', 'consectetur & adipiscing'];
+ const expected = 'Lorem, ipsum, dolar, sit, amit, and consectetur & adipiscing';
expect(grammar.toNounSeriesText(items)).toBe(expected);
});