Add latest changes from gitlab-org/gitlab@12-6-stable-ee

2 files changed, 13 insertions, 2 deletions

diff --git a/spec/frontend/repository/utils/commit_spec.js b/spec/frontend/repository/utils/commit_spec.js
index 2d75358106c..e7cc28178bf 100644
--- a/spec/frontend/repository/utils/commit_spec.js
+++ b/spec/frontend/repository/utils/commit_spec.js
@@ -15,13 +15,14 @@ const mockData = [
 
 describe('normalizeData', () => {
   it('normalizes data into LogTreeCommit object', () => {
-    expect(normalizeData(mockData)).toEqual([
+    expect(normalizeData(mockData, '')).toEqual([
       {
         sha: '123',
         message: 'testing message',
         committedDate: '2019-01-01',
         commitPath: 'https://test.com',
         fileName: 'index.js',
+        filePath: '/index.js',
         type: 'blob',
         __typename: 'LogTreeCommit',
       },
diff --git a/spec/frontend/repository/utils/dom_spec.js b/spec/frontend/repository/utils/dom_spec.js
index 678d444904d..bf98a9e1a4d 100644
--- a/spec/frontend/repository/utils/dom_spec.js
+++ b/spec/frontend/repository/utils/dom_spec.js
@@ -1,5 +1,5 @@
 import { setHTMLFixture } from '../../helpers/fixtures';
-import { updateElementsVisibility } from '~/repository/utils/dom';
+import { updateElementsVisibility, updateFormAction } from '~/repository/utils/dom';
 
 describe('updateElementsVisibility', () => {
   it('adds hidden class', () => {
@@ -18,3 +18,13 @@ describe('updateElementsVisibility', () => {
     expect(document.querySelector('.js-test').classList).not.toContain('hidden');
   });
 });
+
+describe('updateFormAction', () => {
+  it('updates form action', () => {
+    setHTMLFixture('<form class="js-test" action="/"></form>');
+
+    updateFormAction('.js-test', '/gitlab/create', '/test');
+
+    expect(document.querySelector('.js-test').action).toBe('http://localhost/gitlab/create/test');
+  });
+});