Fixes for Tests on file.js and tabs tests

app/assets/javascripts/ide/stores/actions/file.js

@@ -48,9 +48,8 @@ export const setFileActive = ({ commit, state, getters, dispatch }, path) => {
 
 export const getFileData = ({ state, commit, dispatch }, { path, makeFileActive = true }) => {
   const file = state.entries[path];
-  return new Promise((resolve, reject) => {
   commit(types.TOGGLE_LOADING, { entry: file });
-    service
+  return service
     .getFileData(file.url)
     .then(res => {
       const pageTitle = decodeURI(normalizeHeaders(res.headers)['PAGE-TITLE']);
@@ -65,11 +64,9 @@ export const getFileData = ({ state, commit, dispatch }, { path, makeFileActive
       if (makeFileActive) dispatch('setFileActive', file.path);
       commit(types.TOGGLE_LOADING, { entry: file });
     })
-      .catch(err => {
+    .catch(() => {
       commit(types.TOGGLE_LOADING, { entry: file });
       flash('Error loading file data. Please try again.', 'alert', document, null, false, true);
-        reject(err);
-      });
     });
 };
 

spec/javascripts/ide/components/repo_tabs_spec.js

@@ -17,6 +17,7 @@ describe('RepoTabs', () => {
       files: openedFiles,
       viewer: 'editor',
       hasChanges: false,
+      hasMergeRequest: false,
     });
     openedFiles[0].active = true;