Merge remote-tracking branch 'local/MC-40739' into PRodubovyk20210225

Author: o-dubovyk

lib/internal/Magento/Framework/Backup/AbstractBackup.php

@@ -160,7 +160,7 @@ public function setRootDir($rootDir)
             );
         }
 
-        $this->_rootDir = $rootDir;
+        $this->_rootDir = rtrim($rootDir, '/');
         return $this;
     }
 
@@ -181,7 +181,7 @@ public function getRootDir()
      */
     public function setBackupsDir($backupsDir)
     {
-        $this->_backupsDir = $backupsDir;
+        $this->_backupsDir = rtrim($backupsDir, '/');
         return $this;
     }
 

lib/internal/Magento/Framework/Backup/Filesystem.php

@@ -249,6 +249,7 @@ public function getIgnorePaths()
      */
     public function setBackupsDir($backupsDir)
     {
+        $backupsDir = rtrim($backupsDir, '/');
         parent::setBackupsDir($backupsDir);
         $this->addIgnorePaths($backupsDir);
         return $this;

lib/internal/Magento/Framework/Backup/Test/Unit/MediaTest.php

@@ -114,8 +114,8 @@ public function testAction($action)
                 'rollBackFs' => $this->fsMock,
             ]
         );
-        $model->setRootDir($rootDir);
-        $model->setBackupsDir($rootDir);
+        $model->setRootDir($rootDir . '/');
+        $model->setBackupsDir($rootDir . '/');
         $model->{$action}();
         $this->assertTrue($model->getIsSuccess());
 

lib/internal/Magento/Framework/Backup/Test/Unit/NomediaTest.php

@@ -113,8 +113,8 @@ public function testAction($action)
                 'rollBackFs' => $this->fsMock,
             ]
         );
-        $model->setRootDir($rootDir);
-        $model->setBackupsDir($rootDir);
+        $model->setRootDir($rootDir . '/');
+        $model->setBackupsDir($rootDir . '/');
         $model->{$action}();
         $this->assertTrue($model->getIsSuccess());
 

lib/web/mage/adminhtml/backup.js

@@ -70,13 +70,12 @@ define([
          * request backup options.
          */
         requestBackupOptions: function () {
-            var action;
-
             this.hidePopups();
-            action = this.type != 'snapshot' ? 'hide' : 'show'; //eslint-disable-line eqeqeq
             this.showPopup('backup-options');
 
-            $$('#exclude-media-checkbox-container').invoke(action);
+            if (this.type === 'snapshot') {
+                jQuery('#exclude-media-checkbox-container').removeClass('no-display');
+            }
         },
 
         /**