Added repo_service_spec for commitFlash and corrected repo_commit-Secion api specthenable-ajax-api-calls

3 files changed, 60 insertions, 8 deletions

diff --git a/app/assets/javascripts/repo/services/repo_service.js b/app/assets/javascripts/repo/services/repo_service.js
index a8a4b419ae8..af83497fa39 100644
--- a/app/assets/javascripts/repo/services/repo_service.js
+++ b/app/assets/javascripts/repo/services/repo_service.js
@@ -67,13 +67,15 @@ const RepoService = {
 
   commitFiles(payload) {
     return Api.commitMultiple(Store.projectId, payload)
-      .then((data) => {
-        if (data.short_id && data.stats) {
-          Flash(`Your changes have been committed. Commit ${data.short_id} with ${data.stats.additions} additions, ${data.stats.deletions} deletions.`, 'notice');
-        } else {
-          Flash(data.message);
-        }
-      });
+      .then(this.commitFlash);
+  },
+
+  commitFlash(data) {
+    if (data.short_id && data.stats) {
+      window.Flash(`Your changes have been committed. Commit ${data.short_id} with ${data.stats.additions} additions, ${data.stats.deletions} deletions.`, 'notice');
+    } else {
+      window.Flash(data.message);
+    }
   },
 };
 
diff --git a/spec/javascripts/repo/components/repo_commit_section_spec.js b/spec/javascripts/repo/components/repo_commit_section_spec.js
index 1cbb4914005..e604dcc152d 100644
--- a/spec/javascripts/repo/components/repo_commit_section_spec.js
+++ b/spec/javascripts/repo/components/repo_commit_section_spec.js
@@ -3,7 +3,7 @@ import repoCommitSection from '~/repo/components/repo_commit_section.vue';
 import RepoStore from '~/repo/stores/repo_store';
 import RepoService from '~/repo/services/repo_service';
 
-fdescribe('RepoCommitSection', () => {
+describe('RepoCommitSection', () => {
   const branch = 'master';
   const projectUrl = 'projectUrl';
   const changedFiles = [{
diff --git a/spec/javascripts/repo/services/repo_service_spec.js b/spec/javascripts/repo/services/repo_service_spec.js
index d74e6a67b1e..6f530770525 100644
--- a/spec/javascripts/repo/services/repo_service_spec.js
+++ b/spec/javascripts/repo/services/repo_service_spec.js
@@ -1,5 +1,7 @@
 import axios from 'axios';
 import RepoService from '~/repo/services/repo_service';
+import RepoStore from '~/repo/stores/repo_store';
+import Api from '~/api';
 
 describe('RepoService', () => {
   it('has default json format param', () => {
@@ -118,4 +120,52 @@ describe('RepoService', () => {
       }).catch(done.fail);
     });
   });
+
+  describe('commitFiles', () => {
+    it('calls commitMultiple and .then commitFlash', (done) => {
+      const projectId = 'projectId';
+      const payload = {};
+      RepoStore.projectId = projectId;
+
+      spyOn(Api, 'commitMultiple').and.returnValue(Promise.resolve());
+      spyOn(RepoService, 'commitFlash');
+
+      const apiPromise = RepoService.commitFiles(payload);
+
+      expect(Api.commitMultiple).toHaveBeenCalledWith(projectId, payload);
+
+      apiPromise.then(() => {
+        expect(RepoService.commitFlash).toHaveBeenCalled();
+        done();
+      }).catch(done.fail);
+    });
+  });
+
+  describe('commitFlash', () => {
+    it('calls Flash with data.message', () => {
+      const data = {
+        message: 'message',
+      };
+      spyOn(window, 'Flash');
+
+      RepoService.commitFlash(data);
+
+      expect(window.Flash).toHaveBeenCalledWith(data.message);
+    });
+
+    it('calls Flash with success string if short_id and stats', () => {
+      const data = {
+        short_id: 'short_id',
+        stats: {
+          additions: '4',
+          deletions: '5',
+        },
+      };
+      spyOn(window, 'Flash');
+
+      RepoService.commitFlash(data);
+
+      expect(window.Flash).toHaveBeenCalledWith(`Your changes have been committed. Commit ${data.short_id} with ${data.stats.additions} additions, ${data.stats.deletions} deletions.`, 'notice');
+    });
+  });
 });