summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2017-09-29 09:59:09 +0200
committerTim Zallmann <tzallmann@gitlab.com>2017-09-29 09:59:09 +0200
commit0647484c616398858e4c04a577fb557d34685895 (patch)
tree2c856d4a2ffada90049ce9afceb1c45e1f836e9f
parent5adae3d85b11dcaaab0b16e198051c9c2a9885cd (diff)
downloadgitlab-ce-0647484c616398858e4c04a577fb557d34685895.tar.gz
Added Test for PageTitle / Removed Gitlab Part from TItle
-rw-r--r--app/assets/javascripts/repo/helpers/repo_helper.js2
-rw-r--r--spec/javascripts/repo/components/repo_file_spec.js5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/repo/helpers/repo_helper.js b/app/assets/javascripts/repo/helpers/repo_helper.js
index 3603a66c6cd..8498be3ac92 100644
--- a/app/assets/javascripts/repo/helpers/repo_helper.js
+++ b/app/assets/javascripts/repo/helpers/repo_helper.js
@@ -257,7 +257,7 @@ const RepoHelper = {
history.pushState({ key: RepoHelper.key }, '', url);
if (title) {
- document.title = `${title} ยท GitLab`;
+ document.title = `${title}`;
}
},
diff --git a/spec/javascripts/repo/components/repo_file_spec.js b/spec/javascripts/repo/components/repo_file_spec.js
index 518a2d25ecf..f3f4fb94839 100644
--- a/spec/javascripts/repo/components/repo_file_spec.js
+++ b/spec/javascripts/repo/components/repo_file_spec.js
@@ -1,5 +1,6 @@
import Vue from 'vue';
import repoFile from '~/repo/components/repo_file.vue';
+import RepoStore from '~/repo/stores/repo_store';
describe('RepoFile', () => {
const updated = 'updated';
@@ -7,12 +8,14 @@ describe('RepoFile', () => {
icon: 'icon',
url: 'url',
name: 'name',
+ pageTitle: 'pageTitle',
lastCommitMessage: 'message',
lastCommitUpdate: Date.now(),
level: 10,
};
const activeFile = {
url: 'url',
+ pageTitle: 'pageTitle',
};
function createComponent(propsData) {
@@ -32,6 +35,7 @@ describe('RepoFile', () => {
file,
activeFile,
});
+ RepoStore.setActiveFiles(activeFile);
const name = vm.$el.querySelector('.repo-file-name');
const fileIcon = vm.$el.querySelector('.file-icon');
@@ -40,6 +44,7 @@ describe('RepoFile', () => {
expect(name.title).toEqual(file.url);
expect(name.href).toMatch(`/${file.url}`);
expect(name.textContent.trim()).toEqual(file.name);
+ expect(document.title.trim()).toEqual(file.pageTitle);
expect(vm.$el.querySelector('.commit-message').textContent.trim()).toBe(file.lastCommitMessage);
expect(vm.$el.querySelector('.commit-update').textContent.trim()).toBe(updated);
expect(fileIcon.classList.contains(file.icon)).toBeTruthy();