summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2018-03-05 17:31:33 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2018-03-05 17:31:33 +0200
commitf53cf3c486fbf7bf66b7207ff0d92f23aceb8a71 (patch)
tree8ca3eb789d29486fd1467a655b98fe0a7dc6c05c
parenta87bd1d401a324e19f1292afe8734193ae43198c (diff)
downloadgitlab-ce-f53cf3c486fbf7bf66b7207ff0d92f23aceb8a71.tar.gz
Revert js changes to name_with_namespace
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--spec/javascripts/gl_dropdown_spec.js6
-rw-r--r--spec/javascripts/projects_dropdown/store/projects_store_spec.js2
2 files changed, 4 insertions, 4 deletions
diff --git a/spec/javascripts/gl_dropdown_spec.js b/spec/javascripts/gl_dropdown_spec.js
index 20728e3bf76..67b854f61c0 100644
--- a/spec/javascripts/gl_dropdown_spec.js
+++ b/spec/javascripts/gl_dropdown_spec.js
@@ -50,7 +50,7 @@ describe('glDropdown', function describeDropdown() {
search: {
fields: ['name']
},
- text: project => (project.full_name || project.name),
+ text: project => (project.name_with_namespace || project.name),
id: project => project.id,
}, extraOpts);
this.dropdownButtonElement = $('#js-project-dropdown', this.dropdownContainerElement).glDropdown(options);
@@ -76,7 +76,7 @@ describe('glDropdown', function describeDropdown() {
});
it('escapes HTML as text', () => {
- this.projectsData[0].full_name = '<script>alert("testing");</script>';
+ this.projectsData[0].name_with_namespace = '<script>alert("testing");</script>';
initDropDown.call(this, false);
@@ -88,7 +88,7 @@ describe('glDropdown', function describeDropdown() {
});
it('should output HTML when highlighting', () => {
- this.projectsData[0].full_name = 'testing';
+ this.projectsData[0].name_with_namespace = 'testing';
$('.dropdown-input .dropdown-input-field').val('test');
initDropDown.call(this, false, true, {
diff --git a/spec/javascripts/projects_dropdown/store/projects_store_spec.js b/spec/javascripts/projects_dropdown/store/projects_store_spec.js
index ff1cb7abf20..e57399d37cd 100644
--- a/spec/javascripts/projects_dropdown/store/projects_store_spec.js
+++ b/spec/javascripts/projects_dropdown/store/projects_store_spec.js
@@ -24,7 +24,7 @@ describe('ProjectsStore', () => {
const processedProjects = store.getSearchedProjects();
expect(processedProjects.length).toBe(1);
expect(processedProjects[0].id).toBe(mockRawProject.id);
- expect(processedProjects[0].namespace).toBe(mockRawProject.full_name);
+ expect(processedProjects[0].namespace).toBe(mockRawProject.name_with_namespace);
expect(processedProjects[0].webUrl).toBe(mockRawProject.web_url);
expect(processedProjects[0].avatarUrl).toBe(mockRawProject.avatar_url);
});