1 files changed, 67 insertions, 53 deletions
diff --git a/spec/javascripts/merge_request_tabs_spec.js b/spec/javascripts/merge_request_tabs_spec.js
index 6a53c6aa6ac..130d391bfab 100644
--- a/spec/javascripts/merge_request_tabs_spec.js
+++ b/spec/javascripts/merge_request_tabs_spec.js
@@ -1,108 +1,122 @@
-/* eslint-disable */
+/* eslint-disable no-var, comma-dangle, object-shorthand */
 
 /*= require merge_request_tabs */
 //= require breakpoints
+//= require lib/utils/common_utils
+//= require jquery.scrollTo
 
-(function() {
-  describe('MergeRequestTabs', function() {
-    var stubLocation;
-    stubLocation = function(stubs) {
-      var defaults;
-      defaults = {
+(function () {
+  describe('MergeRequestTabs', function () {
+    var stubLocation = {};
+    var setLocation = function (stubs) {
+      var defaults = {
         pathname: '',
         search: '',
         hash: ''
       };
-      return $.extend(defaults, stubs);
+      $.extend(stubLocation, defaults, stubs || {});
     };
     fixture.preload('merge_request_tabs.html');
-    beforeEach(function() {
-      this["class"] = new MergeRequestTabs();
-      return this.spies = {
-        ajax: spyOn($, 'ajax').and.callFake(function() {}),
-        history: spyOn(history, 'replaceState').and.callFake(function() {})
+
+    beforeEach(function () {
+      this.class = new gl.MergeRequestTabs({ stubLocation: stubLocation });
+      setLocation();
+
+      this.spies = {
+        history: spyOn(window.history, 'replaceState').and.callFake(function () {})
       };
     });
-    describe('#activateTab', function() {
-      beforeEach(function() {
+
+    describe('#activateTab', function () {
+      beforeEach(function () {
+        spyOn($, 'ajax').and.callFake(function () {});
         fixture.load('merge_request_tabs.html');
-        return this.subject = this["class"].activateTab;
+        this.subject = this.class.activateTab;
       });
-      it('shows the first tab when action is show', function() {
+      it('shows the first tab when action is show', function () {
         this.subject('show');
-        return expect($('#notes')).toHaveClass('active');
+        expect($('#notes')).toHaveClass('active');
       });
-      it('shows the notes tab when action is notes', function() {
+      it('shows the notes tab when action is notes', function () {
         this.subject('notes');
-        return expect($('#notes')).toHaveClass('active');
+        expect($('#notes')).toHaveClass('active');
       });
-      it('shows the commits tab when action is commits', function() {
+      it('shows the commits tab when action is commits', function () {
         this.subject('commits');
-        return expect($('#commits')).toHaveClass('active');
+        expect($('#commits')).toHaveClass('active');
       });
-      return it('shows the diffs tab when action is diffs', function() {
+      it('shows the diffs tab when action is diffs', function () {
         this.subject('diffs');
-        return expect($('#diffs')).toHaveClass('active');
+        expect($('#diffs')).toHaveClass('active');
       });
     });
-    return describe('#setCurrentAction', function() {
-      beforeEach(function() {
-        return this.subject = this["class"].setCurrentAction;
+
+    describe('#setCurrentAction', function () {
+      beforeEach(function () {
+        spyOn($, 'ajax').and.callFake(function () {});
+        this.subject = this.class.setCurrentAction;
       });
-      it('changes from commits', function() {
-        this["class"]._location = stubLocation({
+      it('changes from commits', function () {
+        setLocation({
           pathname: '/foo/bar/merge_requests/1/commits'
         });
         expect(this.subject('notes')).toBe('/foo/bar/merge_requests/1');
-        return expect(this.subject('diffs')).toBe('/foo/bar/merge_requests/1/diffs');
+        expect(this.subject('diffs')).toBe('/foo/bar/merge_requests/1/diffs');
       });
-      it('changes from diffs', function() {
-        this["class"]._location = stubLocation({
+      it('changes from diffs', function () {
+        setLocation({
           pathname: '/foo/bar/merge_requests/1/diffs'
         });
         expect(this.subject('notes')).toBe('/foo/bar/merge_requests/1');
-        return expect(this.subject('commits')).toBe('/foo/bar/merge_requests/1/commits');
+        expect(this.subject('commits')).toBe('/foo/bar/merge_requests/1/commits');
       });
-      it('changes from diffs.html', function() {
-        this["class"]._location = stubLocation({
+      it('changes from diffs.html', function () {
+        setLocation({
           pathname: '/foo/bar/merge_requests/1/diffs.html'
         });
         expect(this.subject('notes')).toBe('/foo/bar/merge_requests/1');
-        return expect(this.subject('commits')).toBe('/foo/bar/merge_requests/1/commits');
+        expect(this.subject('commits')).toBe('/foo/bar/merge_requests/1/commits');
       });
-      it('changes from notes', function() {
-        this["class"]._location = stubLocation({
+      it('changes from notes', function () {
+        setLocation({
           pathname: '/foo/bar/merge_requests/1'
         });
         expect(this.subject('diffs')).toBe('/foo/bar/merge_requests/1/diffs');
-        return expect(this.subject('commits')).toBe('/foo/bar/merge_requests/1/commits');
+        expect(this.subject('commits')).toBe('/foo/bar/merge_requests/1/commits');
       });
-      it('includes search parameters and hash string', function() {
-        this["class"]._location = stubLocation({
+      it('includes search parameters and hash string', function () {
+        setLocation({
           pathname: '/foo/bar/merge_requests/1/diffs',
           search: '?view=parallel',
           hash: '#L15-35'
         });
-        return expect(this.subject('show')).toBe('/foo/bar/merge_requests/1?view=parallel#L15-35');
+        expect(this.subject('show')).toBe('/foo/bar/merge_requests/1?view=parallel#L15-35');
       });
-      it('replaces the current history state', function() {
-        var new_state;
-        this["class"]._location = stubLocation({
+      it('replaces the current history state', function () {
+        var newState;
+        setLocation({
           pathname: '/foo/bar/merge_requests/1'
         });
-        new_state = this.subject('commits');
-        return expect(this.spies.history).toHaveBeenCalledWith({
+        newState = this.subject('commits');
+        expect(this.spies.history).toHaveBeenCalledWith({
           turbolinks: true,
-          url: new_state
-        }, document.title, new_state);
+          url: newState
+        }, document.title, newState);
       });
-      return it('treats "show" like "notes"', function() {
-        this["class"]._location = stubLocation({
+      it('treats "show" like "notes"', function () {
+        setLocation({
           pathname: '/foo/bar/merge_requests/1/commits'
         });
-        return expect(this.subject('show')).toBe('/foo/bar/merge_requests/1');
+        expect(this.subject('show')).toBe('/foo/bar/merge_requests/1');
+      });
+    });
+    describe('#loadDiff', function () {
+      it('requires an absolute pathname', function () {
+        spyOn($, 'ajax').and.callFake(function (options) {
+          expect(options.url).toEqual('/foo/bar/merge_requests/1/diffs.json');
+        });
+        this.class.loadDiff('/foo/bar/merge_requests/1/diffs');
       });
     });
   });
-
 }).call(this);