From 5ef3e8669db802e2355fd8dea1bef68ea7a48726 Mon Sep 17 00:00:00 2001
From: Bryce Johnson <bryce@gitlab.com>
Date: Wed, 28 Sep 2016 16:58:36 +0200
Subject: [PATCH] Make fixes to get tests passing.

---
 app/assets/javascripts/LabelManager.js.es6                | 7 ++++---
 app/assets/javascripts/blob/blob_ci_yaml.js.es6           | 2 +-
 app/assets/javascripts/blob/blob_license_selectors.js.es6 | 2 +-
 app/assets/javascripts/blob_edit/edit_blob.js             | 2 +-
 app/assets/javascripts/todos.js.es6                       | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/LabelManager.js.es6 b/app/assets/javascripts/LabelManager.js.es6
index b655dfa7113..a66767825e3 100644
--- a/app/assets/javascripts/LabelManager.js.es6
+++ b/app/assets/javascripts/LabelManager.js.es6
@@ -91,10 +91,11 @@
     }
 
     getSortedLabelsIds() {
-    // TODO: Check that this works how you expect
-     return this.prioritizedLabels.find('li').map(function(item) {
-        return $(item).data('id');
+      const sortedIds = [];
+      this.prioritizedLabels.find('li').each(function() {
+        sortedIds.push($(this).data('id'));
       });
+      return sortedIds;
     }
   }
 
diff --git a/app/assets/javascripts/blob/blob_ci_yaml.js.es6 b/app/assets/javascripts/blob/blob_ci_yaml.js.es6
index dee06a7196f..a0fc9519aaa 100644
--- a/app/assets/javascripts/blob/blob_ci_yaml.js.es6
+++ b/app/assets/javascripts/blob/blob_ci_yaml.js.es6
@@ -10,7 +10,7 @@
   global.BlobCiYamlSelector = BlobCiYamlSelector;
 
   class BlobCiYamlSelectors {
-    constructor({ editor, $dropdowns }) {
+    constructor({ editor, $dropdowns } = {}) {
       this.editor = editor;
       this.$dropdowns = $dropdowns || $('.js-gitlab-ci-yml-selector');
       this.initSelectors();
diff --git a/app/assets/javascripts/blob/blob_license_selectors.js.es6 b/app/assets/javascripts/blob/blob_license_selectors.js.es6
index ebc1618816f..153ed457559 100644
--- a/app/assets/javascripts/blob/blob_license_selectors.js.es6
+++ b/app/assets/javascripts/blob/blob_license_selectors.js.es6
@@ -3,7 +3,7 @@
     constructor({ $dropdowns, editor }) {
       this.$dropdowns = $('.js-license-selector');
       this.editor = editor;
-      this.$dropdowns.each((dropdown) => {
+      this.$dropdowns.each((i, dropdown) => {
         const $dropdown = $(dropdown);
         return new BlobLicenseSelector({
           editor,
diff --git a/app/assets/javascripts/blob_edit/edit_blob.js b/app/assets/javascripts/blob_edit/edit_blob.js
index e248b557c96..8db4f6a3b28 100644
--- a/app/assets/javascripts/blob_edit/edit_blob.js
+++ b/app/assets/javascripts/blob_edit/edit_blob.js
@@ -26,7 +26,7 @@
       new gl.BlobLicenseSelectors({
         editor: this.editor
       });
-      new gl.BlobGitignoreSelectors({
+      new BlobGitignoreSelectors({
         editor: this.editor
       });
       new gl.BlobCiYamlSelectors({
diff --git a/app/assets/javascripts/todos.js.es6 b/app/assets/javascripts/todos.js.es6
index 945000c2f43..055228c5df8 100644
--- a/app/assets/javascripts/todos.js.es6
+++ b/app/assets/javascripts/todos.js.es6
@@ -5,7 +5,7 @@
       this.allDoneClicked = this.allDoneClicked.bind(this);
       this.doneClicked = this.doneClicked.bind(this);
       this.el = el || $('.js-todos-options');
-      this.perPage = el.data('perPage');
+      this.perPage = this.el.data('perPage');
       this.clearListeners();
       this.initBtnListeners();
       this.initFilters();