From e805393e210dd1941de7af5983c7f4326890dc98 Mon Sep 17 00:00:00 2001
From: Aidan Feldman <aidan.feldman@gsa.gov>
Date: Sat, 3 Oct 2015 13:30:03 -0400
Subject: [PATCH 01/16] JS cleanup

---
 app/assets/javascripts/filter.js.coffee | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/filter.js.coffee b/app/assets/javascripts/filter.js.coffee
index d0126b659..ec68eb0bf 100644
--- a/app/assets/javascripts/filter.js.coffee
+++ b/app/assets/javascripts/filter.js.coffee
@@ -5,7 +5,7 @@ class Filter
   addInput: ($el) ->
     $el.click () => @filter($el)
     # Initial state
-    if $el.is(":checked")
+    if $el.is(':checked')
       @filter($el)
 
   addRadios: () ->
@@ -18,26 +18,25 @@ class Filter
 
   filter: ($el) ->
     value = $el.val()
-    if !$el.is(":checked")
+    if !$el.is(':checked')
       value = "!" + value
     @$("[data-filter-key=#{ @key }]").each (idx, el) ->
-      hidden = el.getAttribute("data-filter-value") != value
+      hidden = el.getAttribute('data-filter-value') != value
       el.setAttribute("aria-hidden", hidden.toString())
 
   hideAll: () ->
     @$("[data-filter-key=#{ @key }]").attr("aria-hidden", true)
 
-  this.generateIn = ($scope) ->
+  @generateIn = ($scope) ->
     filters = {}
-    $scope.find("[data-filter-control]").each (idx, el) ->
+    $scope.find('[data-filter-control]').each (idx, el) ->
       key = el.getAttribute('data-filter-control')
-      if !filters.hasOwnProperty(key)
-        filters[key] = new Filter($scope, key)
+      filters[key] ||= new Filter($scope, key)
     filters
 
 $ ->
   #  @todo - better scope
-  $scope = $(document)
+  $scope = $(document.body)
   filters = Filter.generateIn($scope)
   for key, filter of filters
     filter.hideAll()

From e4a43baeac224f073e7ad674c58f13e0be1003d8 Mon Sep 17 00:00:00 2001
From: Aidan Feldman <aidan.feldman@gsa.gov>
Date: Sat, 3 Oct 2015 14:31:21 -0400
Subject: [PATCH 02/16] refactor front-end filtering code

---
 app/assets/javascripts/filter.js.coffee | 66 +++++++++++--------------
 1 file changed, 30 insertions(+), 36 deletions(-)

diff --git a/app/assets/javascripts/filter.js.coffee b/app/assets/javascripts/filter.js.coffee
index ec68eb0bf..908f6ceaa 100644
--- a/app/assets/javascripts/filter.js.coffee
+++ b/app/assets/javascripts/filter.js.coffee
@@ -1,44 +1,38 @@
 class Filter
-  constructor: ($root, @key) ->
-    @$ = (selector) -> $root.find(selector)
-
-  addInput: ($el) ->
-    $el.click () => @filter($el)
-    # Initial state
-    if $el.is(':checked')
-      @filter($el)
-
-  addRadios: () ->
-    @$("input:radio[data-filter-control=#{ @key }]").each (idx, control) =>
-      @addInput($(control))
-
-  addChkBoxes: () ->
-    @$("input:checkbox[data-filter-control=#{ @key }]").each (idx, control) =>
-      @addInput($(control))
-
-  filter: ($el) ->
-    value = $el.val()
-    if !$el.is(':checked')
-      value = "!" + value
-    @$("[data-filter-key=#{ @key }]").each (idx, el) ->
-      hidden = el.getAttribute('data-filter-value') != value
-      el.setAttribute("aria-hidden", hidden.toString())
-
-  hideAll: () ->
-    @$("[data-filter-key=#{ @key }]").attr("aria-hidden", true)
+  constructor: (@$root, @$control) ->
+    @key = @$control.data('filter-control')
+    @val = @$control.val()
+
+  $: (selector) ->
+    @$root.find(selector)
+
+  children: ->
+    @$("[data-filter-key=#{ @key }][data-filter-value=#{ @val }]")
+
+  adjacentChildren: ->
+    @$("[data-filter-key=#{ @key }][data-filter-value!=#{ @val }]")
+
+  isSelected: ->
+    @$control.is(':checked')
+
+  filter: ->
+    if @isSelected()
+      @children().attr('aria-hidden', false)
+      @adjacentChildren().attr('aria-hidden', true)
+    else
+      @children().attr('aria-hidden', true)
+
+  enable: ->
+    @filter()
+    @$control.change => @filter()
 
   @generateIn = ($scope) ->
-    filters = {}
-    $scope.find('[data-filter-control]').each (idx, el) ->
-      key = el.getAttribute('data-filter-control')
-      filters[key] ||= new Filter($scope, key)
-    filters
+    $scope.find('[data-filter-control]').map (idx, control) ->
+      new Filter($scope, $(control))
 
 $ ->
   #  @todo - better scope
   $scope = $(document.body)
   filters = Filter.generateIn($scope)
-  for key, filter of filters
-    filter.hideAll()
-    filter.addRadios()
-    filter.addChkBoxes()
+  for filter in filters
+    filter.enable()

From 7cdcfc1a38542a10b7e4e81e01987e3bfe9a1a2e Mon Sep 17 00:00:00 2001
From: Aidan Feldman <aidan.feldman@gsa.gov>
Date: Sat, 3 Oct 2015 15:39:31 -0400
Subject: [PATCH 03/16] disable inputs when they are hidden by a filter

...so that they aren't submitted with forms
---
 app/assets/javascripts/filter.js.coffee | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/filter.js.coffee b/app/assets/javascripts/filter.js.coffee
index 908f6ceaa..2d189f360 100644
--- a/app/assets/javascripts/filter.js.coffee
+++ b/app/assets/javascripts/filter.js.coffee
@@ -1,3 +1,4 @@
+# TODO add tests
 class Filter
   constructor: (@$root, @$control) ->
     @key = @$control.data('filter-control')
@@ -15,12 +16,21 @@ class Filter
   isSelected: ->
     @$control.is(':checked')
 
+  showChildren: ->
+    Filter.toggle(@children(), true)
+
+  hideAdjacentChildren: ->
+    Filter.toggle(@adjacentChildren(), false)
+
+  hideChildren: ->
+    Filter.toggle(@children(), false)
+
   filter: ->
     if @isSelected()
-      @children().attr('aria-hidden', false)
-      @adjacentChildren().attr('aria-hidden', true)
+      @showChildren()
+      @hideAdjacentChildren()
     else
-      @children().attr('aria-hidden', true)
+      @hideChildren()
 
   enable: ->
     @filter()
@@ -30,6 +40,12 @@ class Filter
     $scope.find('[data-filter-control]').map (idx, control) ->
       new Filter($scope, $(control))
 
+  @toggle = ($inputWrappers, showOrHide) ->
+    # https://www.paciellogroup.com/blog/2012/05/html5-accessibility-chops-hidden-and-aria-hidden/
+    $inputWrappers.attr('aria-hidden', !showOrHide)
+    # disable inputs so they aren't submitted with the form
+    $inputWrappers.find(':input').attr('disabled', !showOrHide)
+
 $ ->
   #  @todo - better scope
   $scope = $(document.body)

From 36587454703f507020adcd24f871496ebf594306 Mon Sep 17 00:00:00 2001
From: Aidan Feldman <aidan.feldman@gsa.gov>
Date: Sat, 3 Oct 2015 23:24:45 -0400
Subject: [PATCH 04/16] specify additional required fields on the WorkOrder
 form

---
 app/helpers/ncr/work_orders_helper.rb    | 2 +-
 app/views/ncr/work_orders/form.html.haml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/helpers/ncr/work_orders_helper.rb b/app/helpers/ncr/work_orders_helper.rb
index 95438b8b7..04362350a 100644
--- a/app/helpers/ncr/work_orders_helper.rb
+++ b/app/helpers/ncr/work_orders_helper.rb
@@ -25,7 +25,7 @@ def vendor_options(vendor = nil)
     def expense_type_radio_button(form, expense_type)
       content_tag :div, class: 'radio' do
         form.label :expense_type, value: expense_type do
-          radio = form.radio_button(:expense_type, expense_type, 'data-filter-control' => 'expense-type')
+          radio = form.radio_button(:expense_type, expense_type, 'data-filter-control' => 'expense-type', required: true)
           radio + expense_type
         end
       end
diff --git a/app/views/ncr/work_orders/form.html.haml b/app/views/ncr/work_orders/form.html.haml
index 2f6ff9cf6..0517879ca 100644
--- a/app/views/ncr/work_orders/form.html.haml
+++ b/app/views/ncr/work_orders/form.html.haml
@@ -8,7 +8,7 @@
   = simple_form_for @model_instance, html: { multipart: true } do |f|
     = f.input :project_title
     = f.input :description
-    = field_set_tag "Expense type", class: "required" do
+    = field_set_tag "Expense type", class: 'required' do
       = expense_type_radio_button(f, 'BA60')
       = expense_type_radio_button(f, 'BA61')
       = f.input :emergency, disabled: @model_instance.persisted?, wrapper_html: { data: { filter_key: 'expense-type', filter_value: 'BA61' } }
@@ -23,7 +23,7 @@
     = f.input :direct_pay
     .form-group
       = label_tag :approver_email, "Approving official's email address", class: 'required'
-      = select_tag :approver_email, options_from_collection_for_select(approver_options, :to_s, :to_s, @approver_email), class: 'form-control js-selectize', disabled: @model_instance.approver_email_frozen?, include_blank: true, prompt: 'Type here to search'
+      = select_tag :approver_email, options_from_collection_for_select(approver_options, :to_s, :to_s, @approver_email), class: 'form-control js-selectize', disabled: @model_instance.approver_email_frozen?, include_blank: true, prompt: 'Type here to search', required: true
     - if @model_instance.new_record?
       = render partial: 'attachments'
     - else

From a3e6943b4e12736cb6cd95d6ef4aa0c358249087 Mon Sep 17 00:00:00 2001
From: Aidan Feldman <aidan.feldman@gsa.gov>
Date: Sat, 3 Oct 2015 23:28:08 -0400
Subject: [PATCH 05/16] enable client-side form validation

---
 app/assets/javascripts/selectizer.js.coffee | 4 ++++
 config/initializers/simple_form.rb          | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/selectizer.js.coffee b/app/assets/javascripts/selectizer.js.coffee
index 1f6cbf8c6..b6c7b2851 100644
--- a/app/assets/javascripts/selectizer.js.coffee
+++ b/app/assets/javascripts/selectizer.js.coffee
@@ -3,6 +3,10 @@ class Selectizer
     @$el = $(el)
     @dataAttr = @$el.attr('data-attr') || 'default_field'
 
+    # `required` inputs don't work with Selectize
+    # https://github.com/brianreavis/selectize.js/issues/733
+    @$el.removeAttr('required')
+
   isFreeForm: ->
     @$el.is('input')
 
diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb
index a243b4d77..96e242f71 100644
--- a/config/initializers/simple_form.rb
+++ b/config/initializers/simple_form.rb
@@ -117,8 +117,7 @@
   # in this configuration, which is recommended due to some quirks from different browsers.
   # To stop SimpleForm from generating the novalidate option, enabling the HTML5 validations,
   # change this configuration to true.
-  # TODO enable, but make sure the filtered fields are only required when visible
-  config.browser_validations = false
+  config.browser_validations = true
 
   # Collection of methods to detect if a file type was given.
   # config.file_methods = [ :mounted_as, :file?, :public_filename ]

From d07709e66831fe7dc775d6d70bfbe0af7138e97d Mon Sep 17 00:00:00 2001
From: Aidan Feldman <aidan.feldman@gsa.gov>
Date: Sun, 4 Oct 2015 00:57:36 -0400
Subject: [PATCH 06/16] set up JS testing

---
 Gemfile                                 |  1 +
 Gemfile.lock                            |  9 +++++++++
 app/assets/javascripts/filter.js.coffee |  2 +-
 config/initializers/konacha.rb          |  6 ++++++
 doc/setup.md                            |  1 +
 spec/javascripts/filter_spec.js.coffee  | 21 +++++++++++++++++++++
 6 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 config/initializers/konacha.rb
 create mode 100644 spec/javascripts/filter_spec.js.coffee

diff --git a/Gemfile b/Gemfile
index bfd9a93d8..35edcd990 100644
--- a/Gemfile
+++ b/Gemfile
@@ -49,6 +49,7 @@ gem 'workflow'
 group :test, :development do
   gem 'bullet', require: false # use BULLET_ENABLED=true
   gem 'database_cleaner'
+  gem 'konacha'
   gem 'pry-byebug'
   gem 'pry-rails'
   gem 'rspec-rails'
diff --git a/Gemfile.lock b/Gemfile.lock
index b4b3c6b53..41d45a2d7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -98,6 +98,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.9.1.1)
+    colorize (0.7.7)
     columnize (0.9.0)
     css_parser (1.3.7)
       addressable
@@ -175,6 +176,13 @@ GEM
       turbolinks
     json (1.8.3)
     jwt (1.5.1)
+    konacha (3.7.0)
+      actionpack (>= 3.1, < 5)
+      capybara
+      colorize
+      railties (>= 3.1, < 5)
+      sprockets (>= 2, < 4)
+      tilt
     launchy (2.4.3)
       addressable (~> 2.3)
     letter_opener (1.4.1)
@@ -419,6 +427,7 @@ DEPENDENCIES
   html_pipeline_rails
   jquery-rails
   jquery-turbolinks
+  konacha
   letter_opener
   letter_opener_web
   mail_view
diff --git a/app/assets/javascripts/filter.js.coffee b/app/assets/javascripts/filter.js.coffee
index 2d189f360..25e4661e2 100644
--- a/app/assets/javascripts/filter.js.coffee
+++ b/app/assets/javascripts/filter.js.coffee
@@ -1,5 +1,5 @@
 # TODO add tests
-class Filter
+class @Filter
   constructor: (@$root, @$control) ->
     @key = @$control.data('filter-control')
     @val = @$control.val()
diff --git a/config/initializers/konacha.rb b/config/initializers/konacha.rb
new file mode 100644
index 000000000..d9fb65518
--- /dev/null
+++ b/config/initializers/konacha.rb
@@ -0,0 +1,6 @@
+if defined?(Konacha)
+  Konacha.configure do |config|
+    require 'capybara/poltergeist'
+    config.driver = :poltergeist
+  end
+end
diff --git a/doc/setup.md b/doc/setup.md
index 38552c865..ff568d1fb 100644
--- a/doc/setup.md
+++ b/doc/setup.md
@@ -56,6 +56,7 @@ have it in your PATH. This is used for javascript and interface testing.
 
 ```bash
 ./bin/rspec
+bin/rake konacha:run
 ```
 
 ### Running tests as corresponding files are changed
diff --git a/spec/javascripts/filter_spec.js.coffee b/spec/javascripts/filter_spec.js.coffee
new file mode 100644
index 000000000..8e549049c
--- /dev/null
+++ b/spec/javascripts/filter_spec.js.coffee
@@ -0,0 +1,21 @@
+#= require jquery
+#= require filter
+
+describe 'Filter', ->
+  describe '#children()', ->
+    it "returns elements with the same key and value", ->
+      $content = $('
+        <div>
+          <input data-filter-key="foo" data-filter-value="1"/>
+          <input data-filter-key="foo" data-filter-value="2"/>
+          <input data-filter-key="bar" data-filter-value="1"/>
+          <input data-filter-key="bar" data-filter-value="2"/>
+        </div>
+      ')
+      $control = $('<input type="checkbox" value="2" data-filter-control="foo"/>')
+
+      filter = new Filter($content, $control)
+      $children = filter.children()
+      expect($children.length).to.equal(1)
+      expect($children.data('filter-key')).to.equal('foo')
+      expect($children.data('filter-value')).to.equal(2)

From 17498ef3d8ffdf8a2b6813001e3cfe308eda3467 Mon Sep 17 00:00:00 2001
From: Aidan Feldman <aidan.feldman@gsa.gov>
Date: Sun, 4 Oct 2015 01:04:09 -0400
Subject: [PATCH 07/16] add a test for Filter#adjacentChildren()

---
 spec/javascripts/filter_spec.js.coffee | 32 ++++++++++++++++++--------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/spec/javascripts/filter_spec.js.coffee b/spec/javascripts/filter_spec.js.coffee
index 8e549049c..04f1c19fd 100644
--- a/spec/javascripts/filter_spec.js.coffee
+++ b/spec/javascripts/filter_spec.js.coffee
@@ -2,20 +2,34 @@
 #= require filter
 
 describe 'Filter', ->
+  getContent = ->
+    $('
+      <div>
+        <input data-filter-key="foo" data-filter-value="1"/>
+        <input data-filter-key="foo" data-filter-value="2"/>
+        <input data-filter-key="bar" data-filter-value="1"/>
+        <input data-filter-key="bar" data-filter-value="2"/>
+      </div>
+    ')
+
   describe '#children()', ->
     it "returns elements with the same key and value", ->
-      $content = $('
-        <div>
-          <input data-filter-key="foo" data-filter-value="1"/>
-          <input data-filter-key="foo" data-filter-value="2"/>
-          <input data-filter-key="bar" data-filter-value="1"/>
-          <input data-filter-key="bar" data-filter-value="2"/>
-        </div>
-      ')
       $control = $('<input type="checkbox" value="2" data-filter-control="foo"/>')
 
-      filter = new Filter($content, $control)
+      filter = new Filter(getContent(), $control)
       $children = filter.children()
+
       expect($children.length).to.equal(1)
       expect($children.data('filter-key')).to.equal('foo')
       expect($children.data('filter-value')).to.equal(2)
+
+  describe '#adjacentChildren()', ->
+    it "returns elements with the same key but a different value", ->
+      $control = $('<input type="checkbox" value="2" data-filter-control="foo"/>')
+
+      filter = new Filter(getContent(), $control)
+      $adjacentChildren = filter.adjacentChildren()
+
+      expect($adjacentChildren.length).to.equal(1)
+      expect($adjacentChildren.data('filter-key')).to.equal('foo')
+      expect($adjacentChildren.data('filter-value')).to.equal(1)

From d01bb776de7277fb924a075b093335425d9b3526 Mon Sep 17 00:00:00 2001
From: Aidan Feldman <aidan.feldman@gsa.gov>
Date: Sun, 4 Oct 2015 01:16:42 -0400
Subject: [PATCH 08/16] add tests for Filter.toggle()

---
 spec/javascripts/filter_spec.js.coffee | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/spec/javascripts/filter_spec.js.coffee b/spec/javascripts/filter_spec.js.coffee
index 04f1c19fd..57e5fce34 100644
--- a/spec/javascripts/filter_spec.js.coffee
+++ b/spec/javascripts/filter_spec.js.coffee
@@ -33,3 +33,26 @@ describe 'Filter', ->
       expect($adjacentChildren.length).to.equal(1)
       expect($adjacentChildren.data('filter-key')).to.equal('foo')
       expect($adjacentChildren.data('filter-value')).to.equal(1)
+
+  describe '.toggle()', ->
+    it "disables the inputs", ->
+      $content = $('
+        <div>
+          <label for="foo">Foo</label>
+          <input name="foo">
+        </div>
+      ')
+      Filter.toggle($content, false)
+      $input = $content.find('input')
+      expect($input.is(':disabled')).to.be.true
+
+    it "disables the text areas", ->
+      $content = $('
+        <div>
+          <label for="foo">Foo</label>
+          <textarea name="foo">
+        </div>
+      ')
+      Filter.toggle($content, false)
+      $textarea = $content.find('textarea')
+      expect($textarea.is(':disabled')).to.be.true

From 5c91863b3cb2d7f4fd83259784df4573e7004cd3 Mon Sep 17 00:00:00 2001
From: Aidan Feldman <aidan.feldman@gsa.gov>
Date: Sun, 4 Oct 2015 01:36:20 -0400
Subject: [PATCH 09/16] run JS specs automatically through guard

---
 Gemfile      | 1 +
 Gemfile.lock | 4 ++++
 Guardfile    | 5 +++++
 3 files changed, 10 insertions(+)

diff --git a/Gemfile b/Gemfile
index 35edcd990..023365cd0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -58,6 +58,7 @@ end
 
 group :development do
   gem 'guard-rspec', require: false
+  gem 'guard-shell', require: false
   gem 'mail_view'
   gem 'railroady'
   gem 'letter_opener'
diff --git a/Gemfile.lock b/Gemfile.lock
index 41d45a2d7..a3de5f3b2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -156,6 +156,9 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
+    guard-shell (0.7.1)
+      guard (>= 2.0.0)
+      guard-compat (~> 1.0)
     haml (4.0.7)
       tilt
     hashdiff (0.2.2)
@@ -422,6 +425,7 @@ DEPENDENCIES
   font-awesome-sass
   foreman
   guard-rspec
+  guard-shell
   haml
   hashdiff
   html_pipeline_rails
diff --git a/Guardfile b/Guardfile
index 691a6e262..409b73fa0 100644
--- a/Guardfile
+++ b/Guardfile
@@ -19,3 +19,8 @@ guard :rspec, cmd: 'bin/rspec' do
   watch(%r{^spec/acceptance/(.+)\.feature$})
   watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
 end
+
+guard :shell do
+  watch(%r{^app/assets/javascripts/(.+)\.js(\.coffee)?$}) { |m| `bin/rake konacha:run SPEC=#{m[1]}_spec` }
+  watch(%r{^spec/javascripts/(.+)\.js(\.coffee)?$}) { |m| `bin/rake konacha:run SPEC=#{m[1]}` }
+end

From 9e2f9d1385360592f476b60bc0a905e38008698c Mon Sep 17 00:00:00 2001
From: Aidan Feldman <aidan.feldman@gsa.gov>
Date: Sun, 4 Oct 2015 01:41:18 -0400
Subject: [PATCH 10/16] add more Filter.toggle() tests

---
 app/assets/javascripts/filter.js.coffee |  1 -
 spec/javascripts/filter_spec.js.coffee  | 22 ++++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/filter.js.coffee b/app/assets/javascripts/filter.js.coffee
index 25e4661e2..cd9398768 100644
--- a/app/assets/javascripts/filter.js.coffee
+++ b/app/assets/javascripts/filter.js.coffee
@@ -1,4 +1,3 @@
-# TODO add tests
 class @Filter
   constructor: (@$root, @$control) ->
     @key = @$control.data('filter-control')
diff --git a/spec/javascripts/filter_spec.js.coffee b/spec/javascripts/filter_spec.js.coffee
index 57e5fce34..e73613731 100644
--- a/spec/javascripts/filter_spec.js.coffee
+++ b/spec/javascripts/filter_spec.js.coffee
@@ -56,3 +56,25 @@ describe 'Filter', ->
       Filter.toggle($content, false)
       $textarea = $content.find('textarea')
       expect($textarea.is(':disabled')).to.be.true
+
+    it "enables the inputs", ->
+      $content = $('
+        <div>
+          <label for="foo">Foo</label>
+          <input name="foo" disabled="disabled">
+        </div>
+      ')
+      Filter.toggle($content, true)
+      $input = $content.find('input')
+      expect($input.is(':disabled')).to.be.false
+
+    it "disables the text areas", ->
+      $content = $('
+        <div>
+          <label for="foo">Foo</label>
+          <textarea name="foo" disabled="disabled">
+        </div>
+      ')
+      Filter.toggle($content, true)
+      $textarea = $content.find('textarea')
+      expect($textarea.is(':disabled')).to.be.false

From 28c5be408c1041177fecbb5d52fffb13f1c37d07 Mon Sep 17 00:00:00 2001
From: Aidan Feldman <aidan.feldman@gsa.gov>
Date: Sun, 4 Oct 2015 02:12:36 -0400
Subject: [PATCH 11/16] allow Filter.toggle() to operate directly on inputs

---
 app/assets/javascripts/filter.js.coffee | 10 ++++++---
 spec/javascripts/filter_spec.js.coffee  | 28 ++++++++++---------------
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/app/assets/javascripts/filter.js.coffee b/app/assets/javascripts/filter.js.coffee
index cd9398768..ef74200a6 100644
--- a/app/assets/javascripts/filter.js.coffee
+++ b/app/assets/javascripts/filter.js.coffee
@@ -39,11 +39,15 @@ class @Filter
     $scope.find('[data-filter-control]').map (idx, control) ->
       new Filter($scope, $(control))
 
-  @toggle = ($inputWrappers, showOrHide) ->
+  @toggle = ($inputOrWrappers, showOrHide) ->
     # https://www.paciellogroup.com/blog/2012/05/html5-accessibility-chops-hidden-and-aria-hidden/
-    $inputWrappers.attr('aria-hidden', !showOrHide)
+    $inputOrWrappers.attr('aria-hidden', !showOrHide)
     # disable inputs so they aren't submitted with the form
-    $inputWrappers.find(':input').attr('disabled', !showOrHide)
+    if $inputOrWrappers.is(':input')
+      $inputOrWrappers.attr('disabled', !showOrHide)
+    else
+      $inputs = $inputOrWrappers.find(':input')
+      @toggle($inputs, showOrHide)
 
 $ ->
   #  @todo - better scope
diff --git a/spec/javascripts/filter_spec.js.coffee b/spec/javascripts/filter_spec.js.coffee
index e73613731..c48ae715c 100644
--- a/spec/javascripts/filter_spec.js.coffee
+++ b/spec/javascripts/filter_spec.js.coffee
@@ -19,9 +19,9 @@ describe 'Filter', ->
       filter = new Filter(getContent(), $control)
       $children = filter.children()
 
-      expect($children.length).to.equal(1)
-      expect($children.data('filter-key')).to.equal('foo')
-      expect($children.data('filter-value')).to.equal(2)
+      expect($children.length).to.eql(1)
+      expect($children.data('filter-key')).to.eql('foo')
+      expect($children.data('filter-value')).to.eql(2)
 
   describe '#adjacentChildren()', ->
     it "returns elements with the same key but a different value", ->
@@ -30,9 +30,9 @@ describe 'Filter', ->
       filter = new Filter(getContent(), $control)
       $adjacentChildren = filter.adjacentChildren()
 
-      expect($adjacentChildren.length).to.equal(1)
-      expect($adjacentChildren.data('filter-key')).to.equal('foo')
-      expect($adjacentChildren.data('filter-value')).to.equal(1)
+      expect($adjacentChildren.length).to.eql(1)
+      expect($adjacentChildren.data('filter-key')).to.eql('foo')
+      expect($adjacentChildren.data('filter-value')).to.eql(1)
 
   describe '.toggle()', ->
     it "disables the inputs", ->
@@ -46,7 +46,7 @@ describe 'Filter', ->
       $input = $content.find('input')
       expect($input.is(':disabled')).to.be.true
 
-    it "disables the text areas", ->
+    it "works on other form fields", ->
       $content = $('
         <div>
           <label for="foo">Foo</label>
@@ -68,13 +68,7 @@ describe 'Filter', ->
       $input = $content.find('input')
       expect($input.is(':disabled')).to.be.false
 
-    it "disables the text areas", ->
-      $content = $('
-        <div>
-          <label for="foo">Foo</label>
-          <textarea name="foo" disabled="disabled">
-        </div>
-      ')
-      Filter.toggle($content, true)
-      $textarea = $content.find('textarea')
-      expect($textarea.is(':disabled')).to.be.false
+    it "can operate on inputs directly", ->
+      $input = $('<input name="foo">')
+      Filter.toggle($input, false)
+      expect($input.is(':disabled')).to.be.true

From 3ed73afcd5a8d2c0201f85dba33ad3b1408411f6 Mon Sep 17 00:00:00 2001
From: Aidan Feldman <aidan.feldman@gsa.gov>
Date: Sun, 4 Oct 2015 03:03:41 -0400
Subject: [PATCH 12/16] split Filter into multiple classes

---
 app/assets/javascripts/field_filter.js.coffee | 17 +++++
 app/assets/javascripts/filter.js.coffee       | 40 ++--------
 app/assets/javascripts/filter_set.js.coffee   | 27 +++++++
 spec/javascripts/field_filter_spec.js.coffee  | 72 ++++++++++++++++++
 spec/javascripts/filter_set_spec.js.coffee    | 50 +++++++++++++
 spec/javascripts/filter_spec.js.coffee        | 74 -------------------
 spec/javascripts/spec_helper.js.coffee        |  4 +
 7 files changed, 176 insertions(+), 108 deletions(-)
 create mode 100644 app/assets/javascripts/field_filter.js.coffee
 create mode 100644 app/assets/javascripts/filter_set.js.coffee
 create mode 100644 spec/javascripts/field_filter_spec.js.coffee
 create mode 100644 spec/javascripts/filter_set_spec.js.coffee
 delete mode 100644 spec/javascripts/filter_spec.js.coffee
 create mode 100644 spec/javascripts/spec_helper.js.coffee

diff --git a/app/assets/javascripts/field_filter.js.coffee b/app/assets/javascripts/field_filter.js.coffee
new file mode 100644
index 000000000..083c781a5
--- /dev/null
+++ b/app/assets/javascripts/field_filter.js.coffee
@@ -0,0 +1,17 @@
+class @FieldFilter
+  constructor: (@$fieldOrWrappers) ->
+
+  toggle: (showOrHide) ->
+    # https://www.paciellogroup.com/blog/2012/05/html5-accessibility-chops-hidden-and-aria-hidden/
+    @$fieldOrWrappers.attr('aria-hidden', !showOrHide)
+
+    # disable inputs so they aren't submitted with the form
+    if @$fieldOrWrappers.is(':input')
+      @$fieldOrWrappers.attr('disabled', !showOrHide)
+    @$fieldOrWrappers.find(':input').attr('disabled', !showOrHide)
+
+  show: ->
+    @toggle(true)
+
+  hide: ->
+    @toggle(false)
diff --git a/app/assets/javascripts/filter.js.coffee b/app/assets/javascripts/filter.js.coffee
index ef74200a6..e70f5e19c 100644
--- a/app/assets/javascripts/filter.js.coffee
+++ b/app/assets/javascripts/filter.js.coffee
@@ -1,35 +1,17 @@
-class @Filter
+class Filter
   constructor: (@$root, @$control) ->
-    @key = @$control.data('filter-control')
-    @val = @$control.val()
-
-  $: (selector) ->
-    @$root.find(selector)
-
-  children: ->
-    @$("[data-filter-key=#{ @key }][data-filter-value=#{ @val }]")
-
-  adjacentChildren: ->
-    @$("[data-filter-key=#{ @key }][data-filter-value!=#{ @val }]")
+    key = @$control.data('filter-control')
+    val = @$control.val()
+    @set = new FilterSet(@$root, key, val)
 
   isSelected: ->
     @$control.is(':checked')
 
-  showChildren: ->
-    Filter.toggle(@children(), true)
-
-  hideAdjacentChildren: ->
-    Filter.toggle(@adjacentChildren(), false)
-
-  hideChildren: ->
-    Filter.toggle(@children(), false)
-
   filter: ->
     if @isSelected()
-      @showChildren()
-      @hideAdjacentChildren()
+      @set.show()
     else
-      @hideChildren()
+      @set.hide()
 
   enable: ->
     @filter()
@@ -39,16 +21,6 @@ class @Filter
     $scope.find('[data-filter-control]').map (idx, control) ->
       new Filter($scope, $(control))
 
-  @toggle = ($inputOrWrappers, showOrHide) ->
-    # https://www.paciellogroup.com/blog/2012/05/html5-accessibility-chops-hidden-and-aria-hidden/
-    $inputOrWrappers.attr('aria-hidden', !showOrHide)
-    # disable inputs so they aren't submitted with the form
-    if $inputOrWrappers.is(':input')
-      $inputOrWrappers.attr('disabled', !showOrHide)
-    else
-      $inputs = $inputOrWrappers.find(':input')
-      @toggle($inputs, showOrHide)
-
 $ ->
   #  @todo - better scope
   $scope = $(document.body)
diff --git a/app/assets/javascripts/filter_set.js.coffee b/app/assets/javascripts/filter_set.js.coffee
new file mode 100644
index 000000000..568b25a3d
--- /dev/null
+++ b/app/assets/javascripts/filter_set.js.coffee
@@ -0,0 +1,27 @@
+class @FilterSet
+  constructor: (@$root, @key, @val) ->
+
+  $: (selector) ->
+    @$root.find(selector)
+
+  children: ->
+    @$("[data-filter-key=#{ @key }][data-filter-value=#{ @val }]")
+
+  adjacentChildren: ->
+    @$("[data-filter-key=#{ @key }][data-filter-value!=#{ @val }]")
+
+  showChildren: ->
+    filter = new FieldFilter(@children())
+    filter.show()
+
+  hideAdjacentChildren: ->
+    filter = new FieldFilter(@adjacentChildren())
+    filter.hide()
+
+  show: ->
+    @showChildren()
+    @hideAdjacentChildren()
+
+  hide: ->
+    filter = new FieldFilter(@children())
+    filter.hide()
diff --git a/spec/javascripts/field_filter_spec.js.coffee b/spec/javascripts/field_filter_spec.js.coffee
new file mode 100644
index 000000000..4a04baa9d
--- /dev/null
+++ b/spec/javascripts/field_filter_spec.js.coffee
@@ -0,0 +1,72 @@
+#= require spec_helper
+
+describe 'FieldFilter', ->
+  describe '#show()', ->
+    it "enables inputs", ->
+      $input = $('<input disabled="disabled">')
+
+      filter = new FieldFilter($input)
+      filter.show()
+
+      expect($input.is(':disabled')).to.be.false
+
+    it "enables text areas", ->
+      $textarea = $('<textarea disabled="disabled">')
+
+      filter = new FieldFilter($textarea)
+      filter.show()
+
+      expect($textarea.is(':disabled')).to.be.false
+
+    it "enables nested inputs", ->
+      $content = $('<div><input disabled="disabled"></div>')
+
+      filter = new FieldFilter($content)
+      filter.show()
+
+      $input = $content.find('input')
+      expect($input.is(':disabled')).to.be.false
+
+    it "enables nested text areas", ->
+      $content = $('<div><textarea disabled="disabled"></div>')
+
+      filter = new FieldFilter($content)
+      filter.show()
+
+      $textarea = $content.find('textarea')
+      expect($textarea.is(':disabled')).to.be.false
+
+  describe '#hide()', ->
+    it "disables inputs", ->
+      $input = $('<input>')
+
+      filter = new FieldFilter($input)
+      filter.hide()
+
+      expect($input.is(':disabled')).to.be.true
+
+    it "disables text areas", ->
+      $textarea = $('<textarea>')
+
+      filter = new FieldFilter($textarea)
+      filter.hide()
+
+      expect($textarea.is(':disabled')).to.be.true
+
+    it "disables nested inputs", ->
+      $content = $('<div><input></div>')
+
+      filter = new FieldFilter($content)
+      filter.hide()
+
+      $input = $content.find('input')
+      expect($input.is(':disabled')).to.be.true
+
+    it "disables nested text areas", ->
+      $content = $('<div><textarea></div>')
+
+      filter = new FieldFilter($content)
+      filter.hide()
+
+      $textarea = $content.find('textarea')
+      expect($textarea.is(':disabled')).to.be.true
diff --git a/spec/javascripts/filter_set_spec.js.coffee b/spec/javascripts/filter_set_spec.js.coffee
new file mode 100644
index 000000000..4b1ad1640
--- /dev/null
+++ b/spec/javascripts/filter_set_spec.js.coffee
@@ -0,0 +1,50 @@
+#= require spec_helper
+
+describe 'FilterSet', ->
+  getContent = ->
+    $('
+      <div>
+        <input data-filter-key="foo" data-filter-value="1"/>
+        <input data-filter-key="foo" data-filter-value="2"/>
+        <input data-filter-key="bar" data-filter-value="1"/>
+        <input data-filter-key="bar" data-filter-value="2"/>
+      </div>
+    ')
+
+  describe '#children()', ->
+    it "returns elements with the same key and value", ->
+      filter = new FilterSet(getContent(), 'foo', 2)
+      $children = filter.children()
+
+      expect($children.length).to.eql(1)
+      expect($children.data('filter-key')).to.eql('foo')
+      expect($children.data('filter-value')).to.eql(2)
+
+  describe '#adjacentChildren()', ->
+    it "returns elements with the same key but a different value", ->
+      filter = new FilterSet(getContent(), 'foo', 2)
+      $adjacentChildren = filter.adjacentChildren()
+
+      expect($adjacentChildren.length).to.eql(1)
+      expect($adjacentChildren.data('filter-key')).to.eql('foo')
+      expect($adjacentChildren.data('filter-value')).to.eql(1)
+
+  describe '#show()', ->
+    it "disables all inputs with matching keys but different values", ->
+      $content = getContent()
+      set = new FilterSet($content, 'bar', 1)
+      set.show()
+
+      disabled = $content.find('input').map (i, input) ->
+        $(input).is(':disabled')
+      expect(disabled.get()).to.eql([false, false, false, true])
+
+  describe '#hide()', ->
+    it "disables all inputs with matching keys and values", ->
+      $content = getContent()
+      set = new FilterSet($content, 'bar', 1)
+      set.hide()
+
+      disabled = $content.find('input').map (i, input) ->
+        $(input).is(':disabled')
+      expect(disabled.get()).to.eql([false, false, true, false])
diff --git a/spec/javascripts/filter_spec.js.coffee b/spec/javascripts/filter_spec.js.coffee
deleted file mode 100644
index c48ae715c..000000000
--- a/spec/javascripts/filter_spec.js.coffee
+++ /dev/null
@@ -1,74 +0,0 @@
-#= require jquery
-#= require filter
-
-describe 'Filter', ->
-  getContent = ->
-    $('
-      <div>
-        <input data-filter-key="foo" data-filter-value="1"/>
-        <input data-filter-key="foo" data-filter-value="2"/>
-        <input data-filter-key="bar" data-filter-value="1"/>
-        <input data-filter-key="bar" data-filter-value="2"/>
-      </div>
-    ')
-
-  describe '#children()', ->
-    it "returns elements with the same key and value", ->
-      $control = $('<input type="checkbox" value="2" data-filter-control="foo"/>')
-
-      filter = new Filter(getContent(), $control)
-      $children = filter.children()
-
-      expect($children.length).to.eql(1)
-      expect($children.data('filter-key')).to.eql('foo')
-      expect($children.data('filter-value')).to.eql(2)
-
-  describe '#adjacentChildren()', ->
-    it "returns elements with the same key but a different value", ->
-      $control = $('<input type="checkbox" value="2" data-filter-control="foo"/>')
-
-      filter = new Filter(getContent(), $control)
-      $adjacentChildren = filter.adjacentChildren()
-
-      expect($adjacentChildren.length).to.eql(1)
-      expect($adjacentChildren.data('filter-key')).to.eql('foo')
-      expect($adjacentChildren.data('filter-value')).to.eql(1)
-
-  describe '.toggle()', ->
-    it "disables the inputs", ->
-      $content = $('
-        <div>
-          <label for="foo">Foo</label>
-          <input name="foo">
-        </div>
-      ')
-      Filter.toggle($content, false)
-      $input = $content.find('input')
-      expect($input.is(':disabled')).to.be.true
-
-    it "works on other form fields", ->
-      $content = $('
-        <div>
-          <label for="foo">Foo</label>
-          <textarea name="foo">
-        </div>
-      ')
-      Filter.toggle($content, false)
-      $textarea = $content.find('textarea')
-      expect($textarea.is(':disabled')).to.be.true
-
-    it "enables the inputs", ->
-      $content = $('
-        <div>
-          <label for="foo">Foo</label>
-          <input name="foo" disabled="disabled">
-        </div>
-      ')
-      Filter.toggle($content, true)
-      $input = $content.find('input')
-      expect($input.is(':disabled')).to.be.false
-
-    it "can operate on inputs directly", ->
-      $input = $('<input name="foo">')
-      Filter.toggle($input, false)
-      expect($input.is(':disabled')).to.be.true
diff --git a/spec/javascripts/spec_helper.js.coffee b/spec/javascripts/spec_helper.js.coffee
new file mode 100644
index 000000000..ea345c33d
--- /dev/null
+++ b/spec/javascripts/spec_helper.js.coffee
@@ -0,0 +1,4 @@
+#= require jquery
+#= require field_filter
+#= require filter_set
+#= require filter

From 420e26222ae0d03d955f89860539f443b041291a Mon Sep 17 00:00:00 2001
From: Aidan Feldman <aidan.feldman@gsa.gov>
Date: Sun, 4 Oct 2015 03:31:12 -0400
Subject: [PATCH 13/16] add specs around the Filter class

---
 app/assets/javascripts/filter.js.coffee      |  8 ++---
 spec/javascripts/field_filter_spec.js.coffee |  3 +-
 spec/javascripts/filter_set_spec.js.coffee   | 21 +++++------
 spec/javascripts/filter_spec.js.coffee       | 37 ++++++++++++++++++++
 spec/javascripts/spec_helper.js.coffee       |  8 ++---
 5 files changed, 58 insertions(+), 19 deletions(-)
 create mode 100644 spec/javascripts/filter_spec.js.coffee

diff --git a/app/assets/javascripts/filter.js.coffee b/app/assets/javascripts/filter.js.coffee
index e70f5e19c..7a8fe7bea 100644
--- a/app/assets/javascripts/filter.js.coffee
+++ b/app/assets/javascripts/filter.js.coffee
@@ -1,4 +1,4 @@
-class Filter
+class @Filter
   constructor: (@$root, @$control) ->
     key = @$control.data('filter-control')
     val = @$control.val()
@@ -7,15 +7,15 @@ class Filter
   isSelected: ->
     @$control.is(':checked')
 
-  filter: ->
+  update: ->
     if @isSelected()
       @set.show()
     else
       @set.hide()
 
   enable: ->
-    @filter()
-    @$control.change => @filter()
+    @update()
+    @$control.change => @update()
 
   @generateIn = ($scope) ->
     $scope.find('[data-filter-control]').map (idx, control) ->
diff --git a/spec/javascripts/field_filter_spec.js.coffee b/spec/javascripts/field_filter_spec.js.coffee
index 4a04baa9d..3328e3a66 100644
--- a/spec/javascripts/field_filter_spec.js.coffee
+++ b/spec/javascripts/field_filter_spec.js.coffee
@@ -1,4 +1,5 @@
-#= require spec_helper
+#= require jquery
+#= require field_filter
 
 describe 'FieldFilter', ->
   describe '#show()', ->
diff --git a/spec/javascripts/filter_set_spec.js.coffee b/spec/javascripts/filter_set_spec.js.coffee
index 4b1ad1640..f5755e865 100644
--- a/spec/javascripts/filter_set_spec.js.coffee
+++ b/spec/javascripts/filter_set_spec.js.coffee
@@ -1,3 +1,6 @@
+#= require jquery
+#= require field_filter
+#= require filter_set
 #= require spec_helper
 
 describe 'FilterSet', ->
@@ -13,8 +16,8 @@ describe 'FilterSet', ->
 
   describe '#children()', ->
     it "returns elements with the same key and value", ->
-      filter = new FilterSet(getContent(), 'foo', 2)
-      $children = filter.children()
+      set = new FilterSet(getContent(), 'foo', 2)
+      $children = set.children()
 
       expect($children.length).to.eql(1)
       expect($children.data('filter-key')).to.eql('foo')
@@ -22,8 +25,8 @@ describe 'FilterSet', ->
 
   describe '#adjacentChildren()', ->
     it "returns elements with the same key but a different value", ->
-      filter = new FilterSet(getContent(), 'foo', 2)
-      $adjacentChildren = filter.adjacentChildren()
+      set = new FilterSet(getContent(), 'foo', 2)
+      $adjacentChildren = set.adjacentChildren()
 
       expect($adjacentChildren.length).to.eql(1)
       expect($adjacentChildren.data('filter-key')).to.eql('foo')
@@ -35,9 +38,8 @@ describe 'FilterSet', ->
       set = new FilterSet($content, 'bar', 1)
       set.show()
 
-      disabled = $content.find('input').map (i, input) ->
-        $(input).is(':disabled')
-      expect(disabled.get()).to.eql([false, false, false, true])
+      states = inputDisabledStates($content)
+      expect(states).to.eql([false, false, false, true])
 
   describe '#hide()', ->
     it "disables all inputs with matching keys and values", ->
@@ -45,6 +47,5 @@ describe 'FilterSet', ->
       set = new FilterSet($content, 'bar', 1)
       set.hide()
 
-      disabled = $content.find('input').map (i, input) ->
-        $(input).is(':disabled')
-      expect(disabled.get()).to.eql([false, false, true, false])
+      states = inputDisabledStates($content)
+      expect(states).to.eql([false, false, true, false])
diff --git a/spec/javascripts/filter_spec.js.coffee b/spec/javascripts/filter_spec.js.coffee
new file mode 100644
index 000000000..e68c491b6
--- /dev/null
+++ b/spec/javascripts/filter_spec.js.coffee
@@ -0,0 +1,37 @@
+#= require jquery
+#= require field_filter
+#= require filter_set
+#= require filter
+#= require spec_helper
+
+describe 'Filter', ->
+  getContent = ->
+    $('
+      <div>
+        <input data-filter-key="foo" data-filter-value="1"/>
+        <input data-filter-key="foo" data-filter-value="2"/>
+        <input data-filter-key="bar" data-filter-value="1"/>
+        <input data-filter-key="bar" data-filter-value="2"/>
+      </div>
+    ')
+
+  describe '#update()', ->
+    it "disables the appropriate elements when checked", ->
+      $content = getContent()
+      $control = $('<input type="checkbox" data-filter-control="bar" value="1" checked="checked">')
+
+      filter = new Filter($content, $control)
+      filter.update()
+
+      states = inputDisabledStates($content)
+      expect(states).to.eql([false, false, false, true])
+
+    it "disables the appropriate elements when not checked", ->
+      $content = getContent()
+      $control = $('<input type="checkbox" data-filter-control="bar" value="1">')
+
+      filter = new Filter($content, $control)
+      filter.update()
+
+      states = inputDisabledStates($content)
+      expect(states).to.eql([false, false, true, false])
diff --git a/spec/javascripts/spec_helper.js.coffee b/spec/javascripts/spec_helper.js.coffee
index ea345c33d..ee355451c 100644
--- a/spec/javascripts/spec_helper.js.coffee
+++ b/spec/javascripts/spec_helper.js.coffee
@@ -1,4 +1,4 @@
-#= require jquery
-#= require field_filter
-#= require filter_set
-#= require filter
+@inputDisabledStates = ($content) ->
+  states = $content.find('input').map (i, input) ->
+    $(input).is(':disabled')
+  states.get()

From 4997b0950e2cdcc33a20d5bd678df7091f89b966 Mon Sep 17 00:00:00 2001
From: Aidan Feldman <aidan.feldman@gsa.gov>
Date: Tue, 20 Oct 2015 18:03:15 -0400
Subject: [PATCH 14/16] refactor FieldFilter

---
 app/assets/javascripts/field_filter.js.coffee | 23 +++++++++++++++----
 app/assets/javascripts/filter.js.coffee       |  1 -
 .../javascripts/required_for_submit.js.coffee |  3 +--
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/field_filter.js.coffee b/app/assets/javascripts/field_filter.js.coffee
index 083c781a5..a2c9d0eff 100644
--- a/app/assets/javascripts/field_filter.js.coffee
+++ b/app/assets/javascripts/field_filter.js.coffee
@@ -1,14 +1,27 @@
 class @FieldFilter
   constructor: (@$fieldOrWrappers) ->
 
-  toggle: (showOrHide) ->
+  isInput: ->
+    @$fieldOrWrappers.is(':input')
+
+  toggleVisibility: (showOrHide) ->
     # https://www.paciellogroup.com/blog/2012/05/html5-accessibility-chops-hidden-and-aria-hidden/
     @$fieldOrWrappers.attr('aria-hidden', !showOrHide)
 
-    # disable inputs so they aren't submitted with the form
-    if @$fieldOrWrappers.is(':input')
-      @$fieldOrWrappers.attr('disabled', !showOrHide)
-    @$fieldOrWrappers.find(':input').attr('disabled', !showOrHide)
+  toggleEnabled: (enableOrDisable) ->
+    @$fieldOrWrappers.attr('disabled', !enableOrDisable)
+
+  toggleChildInputs: (enableOrDisable) ->
+    @$fieldOrWrappers.find(':input').attr('disabled', !enableOrDisable)
+
+  toggle: (showOrHide) ->
+    @toggleVisibility(showOrHide)
+
+    # hidden inputs need to be disabled, so they aren't submitted with the form
+    if @isInput()
+      @toggleEnabled(showOrHide)
+    else
+      @toggleChildInputs(showOrHide)
 
   show: ->
     @toggle(true)
diff --git a/app/assets/javascripts/filter.js.coffee b/app/assets/javascripts/filter.js.coffee
index 7a8fe7bea..1a7118338 100644
--- a/app/assets/javascripts/filter.js.coffee
+++ b/app/assets/javascripts/filter.js.coffee
@@ -22,7 +22,6 @@ class @Filter
       new Filter($scope, $(control))
 
 $ ->
-  #  @todo - better scope
   $scope = $(document.body)
   filters = Filter.generateIn($scope)
   for filter in filters
diff --git a/app/assets/javascripts/required_for_submit.js.coffee b/app/assets/javascripts/required_for_submit.js.coffee
index 904246318..a08b648ec 100644
--- a/app/assets/javascripts/required_for_submit.js.coffee
+++ b/app/assets/javascripts/required_for_submit.js.coffee
@@ -10,7 +10,6 @@ class RequiredForSubmit
     @$submit.prop 'disabled', (@$controller.val() == '')
 
 $ ->
-  # @todo - better scope
-  $scope = $(document)
+  $scope = $(document.body)
   $scope.find("[data-disable-if-empty]").each (idx, el) ->
     new RequiredForSubmit($scope, $(el))

From 7c9c68d5f3641e1a828115b285b9ee8ed3faae25 Mon Sep 17 00:00:00 2001
From: Aidan Feldman <aidan.feldman@gsa.gov>
Date: Tue, 20 Oct 2015 18:03:32 -0400
Subject: [PATCH 15/16] run Konancha via rake

---
 Rakefile     | 4 +++-
 doc/setup.md | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Rakefile b/Rakefile
index 70af444bf..47a88fd38 100644
--- a/Rakefile
+++ b/Rakefile
@@ -6,4 +6,6 @@ require File.expand_path('../config/application', __FILE__)
 C2::Application.load_tasks
 
 desc 'Run the test suite'
-task default: "./bin/rspec"
+# RSpec task gets included automatically
+# http://stackoverflow.com/a/28886514/358804
+task default: 'konacha:run'
diff --git a/doc/setup.md b/doc/setup.md
index d8b1e9f54..bc8bee7fb 100644
--- a/doc/setup.md
+++ b/doc/setup.md
@@ -80,7 +80,6 @@ have it in your PATH. This is used for javascript and interface testing.
 
 ```bash
 ./bin/rake
-./bin/rake konacha:run
 ```
 
 ### Running tests as corresponding files are changed

From 3b8b95aa1b8fa77df528c109b1d1f50bb9a6c84b Mon Sep 17 00:00:00 2001
From: Aidan Feldman <aidan.feldman@gsa.gov>
Date: Tue, 27 Oct 2015 12:26:11 -0400
Subject: [PATCH 16/16] rename FilterSet#adjacentChildren to #cousins

---
 app/assets/javascripts/filter_set.js.coffee |  8 ++++----
 spec/javascripts/filter_set_spec.js.coffee  | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/filter_set.js.coffee b/app/assets/javascripts/filter_set.js.coffee
index 568b25a3d..75968a88e 100644
--- a/app/assets/javascripts/filter_set.js.coffee
+++ b/app/assets/javascripts/filter_set.js.coffee
@@ -7,20 +7,20 @@ class @FilterSet
   children: ->
     @$("[data-filter-key=#{ @key }][data-filter-value=#{ @val }]")
 
-  adjacentChildren: ->
+  cousins: ->
     @$("[data-filter-key=#{ @key }][data-filter-value!=#{ @val }]")
 
   showChildren: ->
     filter = new FieldFilter(@children())
     filter.show()
 
-  hideAdjacentChildren: ->
-    filter = new FieldFilter(@adjacentChildren())
+  hideCousins: ->
+    filter = new FieldFilter(@cousins())
     filter.hide()
 
   show: ->
     @showChildren()
-    @hideAdjacentChildren()
+    @hideCousins()
 
   hide: ->
     filter = new FieldFilter(@children())
diff --git a/spec/javascripts/filter_set_spec.js.coffee b/spec/javascripts/filter_set_spec.js.coffee
index f5755e865..4ea6108c9 100644
--- a/spec/javascripts/filter_set_spec.js.coffee
+++ b/spec/javascripts/filter_set_spec.js.coffee
@@ -23,14 +23,14 @@ describe 'FilterSet', ->
       expect($children.data('filter-key')).to.eql('foo')
       expect($children.data('filter-value')).to.eql(2)
 
-  describe '#adjacentChildren()', ->
+  describe '#cousins()', ->
     it "returns elements with the same key but a different value", ->
       set = new FilterSet(getContent(), 'foo', 2)
-      $adjacentChildren = set.adjacentChildren()
+      $cousins = set.cousins()
 
-      expect($adjacentChildren.length).to.eql(1)
-      expect($adjacentChildren.data('filter-key')).to.eql('foo')
-      expect($adjacentChildren.data('filter-value')).to.eql(1)
+      expect($cousins.length).to.eql(1)
+      expect($cousins.data('filter-key')).to.eql('foo')
+      expect($cousins.data('filter-value')).to.eql(1)
 
   describe '#show()', ->
     it "disables all inputs with matching keys but different values", ->