Merge branch 'mr-file-tree-inline-fluid-width-fix' into 'master'

Fixed merge request fill tree not respecting fluid width

Closes #52916

See merge request gitlab-org/gitlab-ce!22487

1 files changed, 8 insertions, 0 deletions

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();