added component specs

5 files changed, 27 insertions, 22 deletions

diff --git a/app/assets/javascripts/ide/components/file_templates/bar.vue b/app/assets/javascripts/ide/components/file_templates/bar.vue
index 055eeadb3f7..db1a4138d05 100644
--- a/app/assets/javascripts/ide/components/file_templates/bar.vue
+++ b/app/assets/javascripts/ide/components/file_templates/bar.vue
@@ -15,9 +15,7 @@ export default {
     },
   },
   watch: {
-    activeFile: {
-      handler: 'setInitialType',
-    },
+    activeFile: 'setInitialType',
   },
   mounted() {
     this.setInitialType();
@@ -38,9 +36,12 @@ export default {
     selectTemplateType(type) {
       this.setSelectedTemplateType(type);
     },
-    selecteTemplate(template) {
+    selectTemplate(template) {
       this.fetchTemplate(template);
     },
+    undo() {
+      this.undoFileTemplate();
+    },
   },
 };
 </script>
@@ -63,29 +64,17 @@ export default {
       :searchable="true"
       :title="__('File templates')"
       class="mr-2"
-      @click="selecteTemplate"
+      @click="selectTemplate"
     />
     <transition name="fade">
       <button
         v-show="updateSuccess"
         type="button"
         class="btn btn-default"
-        @click="undoFileTemplate"
+        @click="undo"
       >
         {{ __('Undo') }}
       </button>
     </transition>
   </div>
 </template>
-
-<style>
-.ide-file-templates {
-  padding: 8px 16px;
-  background-color: #fafafa;
-  border-bottom: 1px solid #eaeaea;
-}
-
-.ide-file-templates .dropdown {
-  min-width: 180px;
-}
-</style>
diff --git a/app/assets/javascripts/ide/components/new_dropdown/modal.vue b/app/assets/javascripts/ide/components/new_dropdown/modal.vue
index c6fa5eb3246..bcd53ac1ba2 100644
--- a/app/assets/javascripts/ide/components/new_dropdown/modal.vue
+++ b/app/assets/javascripts/ide/components/new_dropdown/modal.vue
@@ -51,6 +51,9 @@ export default {
 
       return __('Create file');
     },
+    isCreatingNew() {
+      return this.entryModal.type !== modalTypes.rename;
+    },
   },
   methods: {
     ...mapActions(['createTempEntry', 'renameEntry']),
@@ -110,7 +113,10 @@ export default {
           class="form-control"
           placeholder="/dir/file_name"
         />
-        <ul class="prepend-top-default list-inline">
+        <ul
+          v-if="isCreatingNew"
+          class="prepend-top-default list-inline"
+        >
           <li
             v-for="(template, index) in templateTypes"
             :key="index"
diff --git a/app/assets/javascripts/ide/stores/index.js b/app/assets/javascripts/ide/stores/index.js
index 3af39ce62fd..877d88bb060 100644
--- a/app/assets/javascripts/ide/stores/index.js
+++ b/app/assets/javascripts/ide/stores/index.js
@@ -23,7 +23,7 @@ export const createStore = () =>
       pipelines,
       mergeRequests,
       branches,
-      fileTemplates,
+      fileTemplates: fileTemplates(),
     },
   });
 
diff --git a/app/assets/javascripts/ide/stores/modules/file_templates/index.js b/app/assets/javascripts/ide/stores/modules/file_templates/index.js
index dfa5ef54413..383ff5db392 100644
--- a/app/assets/javascripts/ide/stores/modules/file_templates/index.js
+++ b/app/assets/javascripts/ide/stores/modules/file_templates/index.js
@@ -3,10 +3,10 @@ import * as actions from './actions';
 import * as getters from './getters';
 import mutations from './mutations';
 
-export default {
+export default () => ({
   namespaced: true,
   actions,
   state: createState(),
   getters,
   mutations,
-};
+});
diff --git a/app/assets/stylesheets/page_bundles/ide.scss b/app/assets/stylesheets/page_bundles/ide.scss
index 5ff4e487d04..1d1c614ef8d 100644
--- a/app/assets/stylesheets/page_bundles/ide.scss
+++ b/app/assets/stylesheets/page_bundles/ide.scss
@@ -1442,3 +1442,13 @@ $ide-tree-text-start: $ide-activity-bar-width + $ide-tree-padding;
   top: 50%;
   transform: translateY(-50%);
 }
+
+.ide-file-templates {
+  padding: $grid-size $gl-padding;
+  background-color: $gray-light;
+  border-bottom: 1px solid $white-dark;
+
+  .dropdown {
+    min-width: 180px;
+  }
+}