ensured that site dependencies are included first. fixes #18

travi · May 10, 2014 · b173041 · b173041
1 parent 6bf9574
commit b173041
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/php/framework/src/travi/framework/dependencyManagement/DependencyManager.php b/php/framework/src/travi/framework/dependencyManagement/DependencyManager.php
@@ -147,8 +147,6 @@ public function loadPageDependencies()
             $controllerList = $this->pageDependenciesLists;
         }
 
-        $this->addDependencies($this->pageDependenciesLists['site']);
-
         $controllerName = strtolower($this->request->getController());
         if (isset($controllerList[$controllerName])) {
             $thisController = $controllerList[$controllerName];
@@ -390,6 +388,7 @@ public function setPageStyle($thisPageStyle = '')
     public function setPageDependenciesLists($lists)
     {
         $this->pageDependenciesLists = $lists;
+        $this->addDependencies($this->pageDependenciesLists['site']);
     }
 
     public function setSiteTheme($sheet)

diff --git a/php/framework/test/php/dependencyManagement/DependencyManagerTest.php b/php/framework/test/php/dependencyManagement/DependencyManagerTest.php
@@ -154,6 +154,35 @@ public function testSiteDependenciesAddedEvenIfPageDoesNotHaveExtra()
         );
     }
 
+    public function testThatSiteDependenciesAreLoadedBeforePageDependencies()
+    {
+        $siteDeps = array(
+            'js' => array('script1.js', 'script2.js'),
+            'css' => array('sheet1.css', 'sheet2.css')
+        );
+        $dynamicDeps = array(
+            'js' => array('dynamic.js'),
+            'css' => array('dynamic.css')
+        );
+        $this->dependencyManager->setPageDependenciesLists(
+            array(
+                'site' => $siteDeps
+            )
+        );
+        $this->dependencyManager->addDependencies($dynamicDeps);
+
+        $this->dependencyManager->loadPageDependencies();
+
+        $this->assertEquals(
+            array_merge($siteDeps['js'], $dynamicDeps['js']),
+            $this->dependencyManager->getScripts()
+        );
+        $this->assertEquals(
+            array_merge($siteDeps['css'], $dynamicDeps['css']),
+            $this->dependencyManager->getStyleSheets()
+        );
+    }
+
     public function testPageStyleNotSetIfEmpty()
     {
         $this->fileSystem->expects($this->once())