MAGETWO-31855: UI improvements

- fixed tests

Author: Dmytro Vilchynskyi

dev/tests/integration/testsuite/Magento/Backend/Controller/Adminhtml/AuthTest.php

@@ -168,7 +168,7 @@ public function testDeniedIframeAction()
         $homeUrl = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
             'Magento\Backend\Helper\Data'
         )->getHomePageUrl();
-        $expected = '<script type="text/javascript">parent.window.location =';
+        $expected = '<script>parent.window.location =';
         $this->assertStringStartsWith($expected, $this->getResponse()->getBody());
         $this->assertContains($homeUrl, $this->getResponse()->getBody());
         $this->_logout();

dev/tests/integration/testsuite/Magento/Test/Integrity/StaticFilesTest.php

@@ -30,13 +30,19 @@ class StaticFilesTest extends \PHPUnit_Framework_TestCase
      */
     private $design;
 
+    /**
+     * @var \Magento\Framework\View\Design\ThemeInterface
+     */
+    private $baseTheme;
+
     protected function setUp()
     {
         $om = \Magento\TestFramework\Helper\Bootstrap::getObjectmanager();
         $this->fallback = $om->get('Magento\Framework\View\Design\FileResolution\Fallback\StaticFile');
         $this->explicitFallback = $om->get('Magento\Framework\View\Design\FileResolution\Fallback\Resolver\Simple');
         $this->themeRepo = $om->get('Magento\Framework\View\Design\Theme\FlyweightFactory');
         $this->design = $om->get('Magento\Framework\View\DesignInterface');
+        $this->baseTheme = $om->get('Magento\Framework\View\Design\ThemeInterface');
     }
 
     /**
@@ -125,6 +131,9 @@ private function getDefaultThemePath($area)
      */
     private function getStaticFile($area, $theme, $locale, $filePath, $module, $isExplicit = false)
     {
+        if ($area == 'base') {
+            $theme = $this->baseTheme;
+        }
         if (!is_object($theme)) {
             $themePath = $theme ?: $this->getDefaultThemePath($area);
             $theme = $this->themeRepo->create($themePath, $area);