added a given for small screen size and make dialog depend on the bui…

…lt form
travi · Nov 5, 2014 · b714c33 · b714c33
1 parent fbf0227
commit b714c33
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 17 deletions.
diff --git a/config/uiDependencies.yaml b/config/uiDependencies.yaml
@@ -18,7 +18,7 @@ dialog:
   jsDependencies:
     - framework
     - jqueryUi
-    - /resources/thirdparty/travi-ui/js/form/validationMapper.js
+    - /resources/thirdparty/travi-ui/dist/form.min.js
 
 entityList:
   local: /resources/thirdparty/travi-ui/js/entityList.js

diff --git a/test/php/acceptance/features/bootstrap/DependenciesContext.php b/test/php/acceptance/features/bootstrap/DependenciesContext.php
@@ -61,19 +61,19 @@ public function initializeApplication()
     }
 
     /**
-     * @Given /^no dependencies are defined$/
+     * @AfterScenario
      */
-    public function noDependenciesAreDefined()
+    public function unsetScreenSizeCookie()
     {
-
+        $_COOKIE = array();
     }
 
     /**
-     * @Given /^"([^"]*)" defined as a dependency$/
+     * @Given /^no dependencies are defined$/
      */
-    public function definedAsADependency($dependency)
+    public function noDependenciesAreDefined()
     {
-        $this->dependencyManager->addJavaScript($dependency);
+
     }
 
     /**
@@ -86,6 +86,26 @@ public function environmentIs($environment)
         }
     }
 
+    /**
+     * @Given /^device has a "([^"]*)" screen size$/
+     */
+    public function deviceHasAScreenSize($screenSize)
+    {
+        if ("small" === $screenSize) {
+            $_COOKIE['ev'] = 'm';
+        } elseif ("large" === $screenSize) {
+            $_COOKIE['ev'] = 'l';
+        }
+    }
+
+    /**
+     * @Given /^"([^"]*)" defined as a dependency$/
+     */
+    public function definedAsADependency($dependency)
+    {
+        $this->dependencyManager->addJavaScript($dependency);
+    }
+
     /**
      * @When /^page is rendered$/
      */

diff --git a/test/php/acceptance/features/dependencies.feature b/test/php/acceptance/features/dependencies.feature
@@ -33,22 +33,22 @@ Feature: Front-end Dependency Management
 
     Scenario:
         Given environment is "local"
-#        And device has a "small" screen size
+        And device has a "small" screen size
         And "dialog" defined as a dependency
         When page is rendered
         Then the dependencies lists should contain
-            | js                                                         | css                                                                                      | templates                                                          |
-            | /resources/thirdparty/jquery/jquery.js                     | http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.4/themes/smoothness/jquery-ui.min.css | /resources/thirdparty/travi-core/templates/enhancementVersion.tmpl |
-            | /resources/thirdparty/amplify/amplify.core.js              |                                                                                          |                                                                    |
-            | /resources/thirdparty/jsrender/jsrender.js                 |                                                                                          |                                                                    |
-            | /resources/thirdparty/travi-core/dist/travi-core.min.js    |                                                                                          |                                                                    |
-            | /resources/thirdparty/jquery-ui/jquery-ui.js               |                                                                                          |                                                                    |
-            | /resources/thirdparty/travi-ui/js/form/validationMapper.js |                                                                                          |                                                                    |
-            | /resources/thirdparty/travi-ui/dist/dialog.min.js          |                                                                                          |                                                                    |
+            | js                                                      | css                                                                                      | templates                                                          |
+            | /resources/thirdparty/jquery/jquery.js                  | http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.4/themes/smoothness/jquery-ui.min.css | /resources/thirdparty/travi-core/templates/enhancementVersion.tmpl |
+            | /resources/thirdparty/amplify/amplify.core.js           |                                                                                          |                                                                    |
+            | /resources/thirdparty/jsrender/jsrender.js              |                                                                                          |                                                                    |
+            | /resources/thirdparty/travi-core/dist/travi-core.min.js |                                                                                          |                                                                    |
+            | /resources/thirdparty/jquery-ui/jquery-ui.js            |                                                                                          |                                                                    |
+            | /resources/thirdparty/travi-ui/dist/form.min.js         |                                                                                          |                                                                    |
+            | /resources/thirdparty/travi-ui/dist/dialog.min.js       |                                                                                          |                                                                    |
 
     Scenario:
         Given environment is "local"
-#        And device has a "small" screen size
+        And device has a "small" screen size
         And "entityList" defined as a dependency
         When page is rendered
         Then the dependencies lists should contain