Fixes #36 - use phantomjs-gem version 1.9.8.0 to match the version pr…

…einstalled on travis Merge pull request #37 from UKHomeOffice/devtask/36-fix-version-of-phantomjs Fixes #36 - use phantomjs-gem version 1.9.8.0 to match the version pr… fixes #33 - validation errors on first page relating to date fixed 2 typos in comments regarding overriding required validtion merged in master
UKHomeOffice-attic · Apr 8, 2016 · 370a05a · 370a05a
1 parent 402fd8b
commit 370a05a
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 14 deletions.
diff --git a/acceptance_tests/Gemfile b/acceptance_tests/Gemfile
@@ -2,9 +2,9 @@ source "https://rubygems.org"
 
 gem 'cucumber'
 gem 'capybara'
-gem 'rspec'
 gem 'poltergeist'
-gem 'phantomjs', :group => :test
+gem 'rspec'
+gem 'phantomjs', '1.9.8.0'
 gem 'show_me_the_cookies'
 gem 'yard-cucumber'
 gem 'selenium-webdriver', '2.45.0'
diff --git a/apps/my_awesome_form/controllers/first-page.js b/apps/my_awesome_form/controllers/first-page.js
@@ -11,8 +11,12 @@ var FirstPageController = function FirstPageController() {
 
 util.inherits(FirstPageController, DateController);
 
-FirstPageController.prototype.validateField = function validateField(keyToValidate, req) {
-  return DateController.prototype.validateField.call(this, keyToValidate, req, false);
-};
+/*
+ * The validateField method can be overidden in the following way to
+ * always allow date to be omitted, regardless of settings in fields directory
+ */
+// FirstPageController.prototype.validateField = function validateField(keyToValidate, req) {
+//   return DateController.prototype.validateField.call(this, keyToValidate, req, false);
+// };
 
 module.exports = FirstPageController;
diff --git a/apps/my_awesome_form/fields/first-page.js b/apps/my_awesome_form/fields/first-page.js
@@ -16,17 +16,19 @@ module.exports = {
     }]
   },
   'example-dob': {
-    validate: ['required', 'numeric'],
     legend: 'fields.example-dob.legend',
     hint: 'fields.example-dob.hint'
   },
   'example-dob-day': {
+    validate: ['required', 'numeric'],
     label: 'fields.example-dob-day.label'
   },
   'example-dob-month': {
+    validate: ['required', 'numeric'],
     label: 'fields.example-dob-month.label'
   },
   'example-dob-year': {
+    validate: ['required', 'numeric'],
     label: 'fields.example-dob-year.label'
   },
   'example-text': {

diff --git a/apps/my_awesome_form/translations/src/en/validation.json b/apps/my_awesome_form/translations/src/en/validation.json
@@ -21,4 +21,4 @@
   "multiples-input": {
     "multipleError": "That isn't a multiple of 3, try again!"
   }
-}
+}
diff --git a/apps/my_awesome_form/views/first-page.html b/apps/my_awesome_form/views/first-page.html
@@ -43,15 +43,17 @@ <h1>Example date group</h1>
         {{#input-date}}example-dob{{/input-date}}
     </div>
 
-    <h1>Example text input</h1>
-    {{#input-text}}example-text{{/input-text}}
-    <h1>Example text input with validation for email address</h1>
-    {{#input-text}}example-email{{/input-text}}
-    <h1>Example checkbox</h1>
-    {{#checkbox}}example-checkbox{{/checkbox}}
-
 </fieldset>
 
+
+<h1>Example text input</h1>
+{{#input-text}}example-text{{/input-text}}
+<h1>Example text input with validation for email address</h1>
+{{#input-text}}example-email{{/input-text}}
+<h1>Example checkbox</h1>
+{{#checkbox}}example-checkbox{{/checkbox}}
+
+
 {{#input-submit}}continue{{/input-submit}}
 {{/form}}