From 369bb6fb144d5ff6dca24e7e14ea795deea9bb86 Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Fri, 19 Oct 2018 10:37:42 +0100 Subject: Fixed merge request fill tree not respecting fluid width This fixes a bug where the merge request fill tree would not respect the users fluid width preference. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52916 --- spec/javascripts/merge_request_tabs_spec.js | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'spec') diff --git a/spec/javascripts/merge_request_tabs_spec.js b/spec/javascripts/merge_request_tabs_spec.js index 7251ce19a90..7714197c821 100644 --- a/spec/javascripts/merge_request_tabs_spec.js +++ b/spec/javascripts/merge_request_tabs_spec.js @@ -224,6 +224,14 @@ describe('MergeRequestTabs', function() { expect($('.content-wrapper')).not.toContainElement('.container-limited'); }); + it('does not add container-limited when fluid layout is prefered', function() { + $('.content-wrapper .container-fluid').removeClass('container-limited'); + + this.class.expandViewContainer(false); + + expect($('.content-wrapper')).not.toContainElement('.container-limited'); + }); + it('does remove container-limited from breadcrumbs', function() { $('.container-limited').addClass('breadcrumbs'); this.class.expandViewContainer(); -- cgit v1.2.1