doop 0.0.3.1 → 0.0.4.1

data/lib/generators/doopgovuk/templates/app/views/doop/_tooltip.html.erb

@@ -1,3 +1,3 @@
-<div class="tooltip">
+<div class="tooltip" id="<%=id%>-tooltip">
   <% content.call %>
 </div>

data/lib/generators/doopgovuk/templates/spec/features/demo_spec.rb

@@ -2,69 +2,142 @@ require 'rails_helper'
 require 'pry'
 
 
-feature "Doop questionnaire" do
+feature "Child Benefit online form" do
 
-  scenario "Quick run through", :js => true do
-    load_completed_form
+  scenario "Complete Child Benefit form", :js => true do
+    before_you_begin
+    preamble
+    about_you
+    children
+    declaration
   end
 
-  scenario "Changing an answer, causes change_answer_tool_tip_text to appear", :js => true do
-    load_completed_form
-    change_page( "Apply Online" )
-    change_question( "Have you enrolled for this service before") do 
-      expect(change_answer_tooltip_text).to match /additional questions may be asked/
-    end
+  def before_you_begin
+    visit '/demo/index'
+    wait_for_page( "before_you_begin" )
+    click_button "Start"
   end
 
-  scenario "Answering a question results in a tooltip appearing", :js => true do
-    load_completed_form
-    change_page( "Apply Online" )
-    change_question( "Turn debug on") do 
-      click_button "No" 
-      expect(tooltip_text).to match /Are you sure/
+  def preamble
+    wait_for_page( "preamble" )
+
+    # check income_more_than_50000 alternate flows
+    answer_question( "income_more_than_50000")  do
+      click_button "No,"
+      expect( tooltip ).to be_visible
+    end
+    expect( question "do_you_still_want_to_apply" ).to be_disabled
+
+    change_question( "income_more_than_50000") do
+      expect( change_answer_tooltip ).to be_visible
+      click_button "Yes," 
     end
+
+    expect( question "do_you_still_want_to_apply" ).to be_enabled
+
+    answer_question( "do_you_still_want_to_apply")  { click_button "Yes," }
+    click_button "Continue" 
   end
 
-  scenario "Answering a question results in a new question being asked", :js => true do
-    load_completed_form
-    change_page( "Apply Online" )
-    change_question( "Have you enrolled for this service before")  { click_button "Yes" }
-    expect( question "What year did you last apply" ).to be_enabled
-    change_question( "Have you enrolled for this service before")  { click_button "No" }
-    expect( question "What year did you last apply" ).to be_disabled
+
+  def about_you
+    wait_for_page( "about_you" )
+    answer_question( "your_name") do
+      b_fill_in( "title" => "Mr", "surname" => "Middleton", "firstname" => "Mark", "middlenames" => "Alan")
+      click_button "Continue" 
+      expect( rollup_text ).to eq( "Mr Mark Alan Middleton" )
+    end
+    answer_question( "known_by_other_name" ) { click_button "No," }
+    expect( question "previous_name" ).to be_disabled
+    change_question( "known_by_other_name" ) { click_button "Yes," }
+    expect( question "previous_name" ).to be_enabled
+
+    answer_question( "previous_name" ) { b_fill_in( "answer" => "Bob Smith"); click_button "Continue" }
+
+    answer_question( "dob" ) do
+      b_fill_in( "answer" => "25/02/1977")
+      click_button "Continue"
+      expect( rollup_text ).to eq( "25 February 1977" )
+    end
+
+    answer_question( "your_address" ) do
+      b_fill_in( "address1" => "1 Runswick Avenue", "address2" => "Woolston", "address3" => "Leeds", "postcode" => "LE31 4WP" )
+      click_button "Continue"
+      expect( rollup_text ).to eq( "1 Runswick Avenue, LE31 4WP" )
+    end
+
+    answer_question( "lived_at_address_for_more_than_12_months" ) { click_button "Yes," }
+    expect( question "last_address" ).to be_disabled
+    change_question( "lived_at_address_for_more_than_12_months" ) { click_button "No," }
+    expect( question "last_address" ).to be_enabled
+
+    answer_question( "last_address" ) do
+      b_fill_in( "address1" => "5 Runswick Avenue", "address2" => "Woolston", "address3" => "Leeds", "postcode" => "LE31 4WP" )
+      click_button "Continue"
+      expect( rollup_text ).to eq( "5 Runswick Avenue, LE31 4WP" )
+    end
+
+    answer_question( "your_phone_numbers" ) do
+      b_fill_in( "daytime" => "01235 6789117", "evening" => "01235 678117" )
+      click_button "Continue"
+      expect( rollup_text ).to eq( "Provided" )
+    end
+
+    answer_question( "have_nino" ) { click_button "No," }
+    expect( question "nino" ).to be_disabled
+
+    change_question( "have_nino" ) { click_button "Yes," }
+    expect( question "nino" ).to be_enabled
+
+    answer_question( "nino" ) do
+      b_fill_in( "answer" => "00123456A" )
+      click_button "Continue"
+      expect( rollup_text ).to eq( "00123456A" )
+    end
+
+    click_button "Continue"
   end
 
-  def load_completed_form
-    
-    if $completed_form_yaml != nil
-      visit '/demo/harness'
-      fill_in( "doop_data", :with => $completed_form_yaml )
-      click_button "Render"
-      return
+  def children
+    wait_for_page( "children" )
+
+    answer_question( "how_many_birth_certs" ) do
+      b_fill_in( "answer" => "1" ); click_button "Continue" 
     end
 
-    visit '/demo/index'
-    wait_for_page( "Apply Online" )
-    answer_question( "Turn debug on") { click_button "Yes" }
-    answer_question( "Have you enrolled for this service before")  { click_button "Yes" }
-    answer_question( "What year did you last apply")  { select( '2012', :from => 'b_answer' ); click_button "Continue"  }
-    answer_question( "Why are you applying")  { fill_in( 'b_answer', :with => "My circumstances have changed" ); click_button "Continue"}
-    click_button "Continue and Save"
-
-    wait_for_page( "Your Details" )
-    answer_question( "What is your name") do 
-      b_fill_in( "firstname" => "mark", "surname" => "middleton" )
-      click_button "Continue" 
-      expect(rollup_text).to be == "Mark Middleton" 
+    # child__1
+    answer_question( "name" ) do 
+      b_fill_in( "firstname" => "Padraig", "middlenames" => "Alan", "surname" => "Middleton" ); click_button "Continue" 
+      expect( rollup_text ).to eq ( "Padraig Alan Middleton" )
+    end
+    answer_question( "gender" ) { click_button "Male" }
+    answer_question( "dob" ) { b_fill_in( "answer" => "30/09/2006" ); click_button "Continue" }
+    answer_question( "own_child" ) { click_button "Yes," }
+    answer_question( "child__1" ) { click_button "Continue" }
+
+    # child__2
+    click_button "Add another child"
+    answer_question( "name" ) do 
+      b_fill_in( "firstname" => "Annie", "middlenames" => "", "surname" => "Middleton" ); click_button "Continue" 
+      expect( rollup_text ).to eq ( "Annie Middleton" )
     end
-    address = { "address1" => "1 Runswick Avenue", "address2" => "Telford", "address3" => "Shropshire", "postcode" => "T56 HDJ" }
-    answer_question( "Address 1") { b_fill_in( address); click_button "Continue" }
+    answer_question( "gender" ) { click_button "Female" }
+    answer_question( "dob" ) { b_fill_in( "answer" => "24/02/2008" ); click_button "Continue" }
+    answer_question( "own_child" ) { click_button "Yes," }
+    answer_question( "child__2" ) { click_button "Continue" }
+
+    # remove child__2
+    change_question( "child__2" ) {
+      click_button "Remove child"
+    }
+
+    expect( question "child__2" ).to be_disabled
     click_button "Continue"
-    click_button "Continue and Save"
 
-    wait_for_page( "Summary" )
-    answer_question( "Terms and conditions") { click_button "I have read" }
-    $completed_form_yaml = page.find_by_id( "doop_data", :visible => false).value
   end
 
+
+  def declaration
+    wait_for_page( "declaration" )
+  end
 end

data/lib/generators/doopgovuk/templates/spec/rails_helper.rb

@@ -8,6 +8,8 @@ require 'capybara/rspec'
 require 'capybara-webkit'
 require 'headless'
 require 'capybara-screenshot/rspec'
+require 'doop-rspec'
+
 
 
 Capybara.javascript_driver = :webkit
@@ -44,6 +46,8 @@ RSpec.configure do |config|
     @headless.destroy
   end
 
+  config.filter_run_excluding :broken => true
+
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
   #config.fixture_path = "#{::Rails.root}/spec/fixtures"
 
@@ -67,76 +71,3 @@ RSpec.configure do |config|
   # https://relishapp.com/rspec/rspec-rails/docs
   #config.infer_spec_type_from_file_location!
 end
-
-RSpec::Matchers.define :be_asked do 
-  match do |q_title|
-    page.has_css?( '.question-open h2', :text => q_title )
-  end
-
-  failure_message do |q_title|
-    actual = page.all( '.question-open h2', ).last.text
-    "Expected question to be asked: #{q_title}, but was asked #{actual}"
-  end
-
-end
-
-RSpec::Matchers.define :be_enabled do 
-  match do |q_title|
-    page.has_css?( '.question_title', :text => q_title )
-  end
-end
-
-RSpec::Matchers.define :be_disabled do 
-  match do |q_title|
-    page.has_no_css?( '.question_title', :text => q_title )
-  end
-end
-
-def question text
-  text
-end
-
-def change_question q_title, &block
-  @q_title = q_title
-  page.find( '.question-closed div.title', :text => q_title ).find(:xpath, "..").find( 'div.answer a' ).click
-  expect( question q_title ).to be_asked
-  yield block
-end
-
-def answer_question q_title, &block
-  @q_title = q_title
-  expect( question q_title ).to be_asked
-  yield block
-  page.find( '.question-closed div.title', :text => q_title )
-end
-
-def rollup_text
-  page.find( '.question-closed div.title', :text => @q_title ).find(:xpath, '..').find( 'div.answer').text
-end
-
-def tooltip_text
-  page.find( '.tooltip' ).text
-end
-
-def change_answer_tooltip_text
-  page.find( '.change_answer_tooltip' ).text
-end
-
-def wait_for_page p_title
-  page.find_by_id( "page_title", :text=>p_title)
-end
-
-def page_title
-  page.find_by_id( "page_title").text
-end
-
-def b_fill_in options = {}
-  options.keys.each do |key|
-    page.fill_in( "b_#{key}", :with => options[key] )
-  end
-end
-
-def change_page page_name
-  page.find_link( page_name ).click
-  wait_for_page page_name
-end

data/spec/doop_spec.rb

@@ -2,6 +2,53 @@ require "spec_helper"
 
 describe "Doop" do
 
+  describe "answering in sequence" do
+
+    let(:question) {
+      q = Doop::Doop.new 
+      q.yaml=
+        <<-EOS
+    
+        pages: {
+          about_you: { 
+            dob: { _question: "What is your dob" }
+          },
+          about_your_partner: { 
+            dob: { _question: "What is your dob" }
+          }
+        }
+
+        EOS
+      q.init
+      q.ask_next
+      q
+    }
+
+    it "can handle questions with similar names" do
+      expect(question.currently_asked).to eq( "/pages/about_you/dob" )
+      question.answer( { "answer" => "aa"} )
+      expect(question.currently_asked).to eq( "/pages/about_you" )
+      question.answer( { "answer" => "bb"} )
+      expect(question.currently_asked).to eq( "/pages/about_your_partner/dob" )
+      question.answer( { "answer" => "cc"} )
+      expect(question.currently_asked).to eq( "/pages/about_your_partner" )
+      question.answer( { "answer" => "dd"} )
+      expect(question.currently_asked).to eq( "/pages" )
+      question.answer( { "answer" => "ee"} )
+
+      expect( question["/pages/about_you/dob/_answer"] ).to eq("aa")
+      expect( question["/pages/about_you/_answer"] ).to eq("bb")
+      expect( question["/pages/about_your_partner/dob/_answer"] ).to eq("cc")
+      expect( question["/pages/about_your_partner/_answer"] ).to eq("dd")
+      expect( question["/pages/_answer"] ).to eq("ee")
+
+      question.change( "/pages/about_you/dob" )
+      question.answer( { "answer" => "ff"} )
+      expect(question.currently_asked).to eq( "/pages/about_you" )
+    end
+
+  end
+
   describe "automatic binding" do
 
     let(:question) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doop
 version: !ruby/object:Gem::Version
-  version: 0.0.3.1
+  version: 0.0.4.1
 platform: ruby
 authors:
 - Mark Middleton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-03 00:00:00.000000000 Z
+date: 2014-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,30 +42,30 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
 description: A question framework for govuk sites, inspired by the work GDS have done
   to standardize the cross government internet presence.
 email:
@@ -83,30 +83,40 @@ files:
 - Rakefile
 - app/assets/images/dash.gif
 - app/assets/images/info-icon.png
+- app/assets/images/nino-icon.png
+- app/assets/images/passport-icon.png
 - app/assets/images/progress-tick-large.png
+- app/assets/images/time-icon.png
 - app/helpers/doop_helper.rb
 - bin/.gitignore
 - doop.gemspec
+- lib/doop-rspec.rb
 - lib/doop.rb
 - lib/doop/version.rb
 - lib/doop_controller.rb
 - lib/generators/doopgovuk/USAGE
 - lib/generators/doopgovuk/doopgovuk_generator.rb
 - lib/generators/doopgovuk/templates/app/assets/javascripts/demo.js.coffee
+- lib/generators/doopgovuk/templates/app/assets/javascripts/demo/application.js
 - lib/generators/doopgovuk/templates/app/assets/stylesheets/demo.css.scss
+- lib/generators/doopgovuk/templates/app/assets/stylesheets/demo/application.css
 - lib/generators/doopgovuk/templates/app/controllers/demo_controller.rb
+- lib/generators/doopgovuk/templates/app/views/demo/_about_you.html.erb
+- lib/generators/doopgovuk/templates/app/views/demo/_before_you_begin.html.erb
+- lib/generators/doopgovuk/templates/app/views/demo/_children.html.erb
+- lib/generators/doopgovuk/templates/app/views/demo/_declaration.html.erb
 - lib/generators/doopgovuk/templates/app/views/demo/_preamble.html.erb
-- lib/generators/doopgovuk/templates/app/views/demo/_summary.html.erb
-- lib/generators/doopgovuk/templates/app/views/demo/_your_details.html.erb
 - lib/generators/doopgovuk/templates/app/views/demo/harness.html.erb
 - lib/generators/doopgovuk/templates/app/views/demo/index.html.erb
 - lib/generators/doopgovuk/templates/app/views/demo/index.js.erb
 - lib/generators/doopgovuk/templates/app/views/doop/_change_answer_tooltip.html.erb
+- lib/generators/doopgovuk/templates/app/views/doop/_debug.html.erb
 - lib/generators/doopgovuk/templates/app/views/doop/_error.html.erb
 - lib/generators/doopgovuk/templates/app/views/doop/_info_box.html.erb
 - lib/generators/doopgovuk/templates/app/views/doop/_navbar.html.erb
 - lib/generators/doopgovuk/templates/app/views/doop/_question.html.erb
 - lib/generators/doopgovuk/templates/app/views/doop/_question_form.html.erb
+- lib/generators/doopgovuk/templates/app/views/doop/_textfield.html.erb
 - lib/generators/doopgovuk/templates/app/views/doop/_tooltip.html.erb
 - lib/generators/doopgovuk/templates/app/views/layouts/application.html.erb
 - lib/generators/doopgovuk/templates/spec/features/demo_spec.rb

data/lib/generators/doopgovuk/templates/app/views/demo/_summary.html.erb

@@ -1,10 +0,0 @@
-
-<%=question_form doop, res do %>
-  <%=question "/page/summary" do |root, answer| %>
-    <%=question "/page/summary/terms_and_conditions" do |root, answer| %>
-      <p>I have answered the questions to the best of my knowledge and agree to abide by the terms and conditions of this service.</p>
-      <button>I have read and understood the terms and conditions</button>
-    <% end %>
-
-  <% end %>
-<% end %>