fe 1.0.0 → 2.0.0

data/db/migrate/20151021184250_add_question_sheet_id_in_refs.rb

@@ -0,0 +1,12 @@
+class AddQuestionSheetIdInRefs < ActiveRecord::Migration[4.2]
+  def change
+    add_column Fe::ReferenceSheet.table_name, :question_sheet_id, :integer
+
+    # set initial question_sheet_id on all refs
+    # NOTE: doing an update on a join query is a pain to do in both mysql and postgres
+    # and since there's not that many reference questions, this should be fine
+    Fe::ReferenceQuestion.all.each do |rq|
+      Fe::ReferenceSheet.where(question_id: rq.id).update_all(question_sheet_id: rq.related_question_sheet_id)
+    end
+  end
+end

data/db/migrate/20160201185838_add_visible_and_visibility_cache_key_to_reference_sheets.rb

@@ -0,0 +1,6 @@
+class AddVisibleAndVisibilityCacheKeyToReferenceSheets < ActiveRecord::Migration[4.2]
+  def change
+    add_column Fe::ReferenceSheet.table_name, :visible, :boolean
+    add_column Fe::ReferenceSheet.table_name, :visibility_cache_key, :string
+  end
+end

data/db/migrate/20160805221415_add_rating_extra_labels.rb

@@ -0,0 +1,10 @@
+class AddRatingExtraLabels < ActiveRecord::Migration[4.2]
+  def change
+    add_column Fe::Element.table_name, :rating_before_label, :text
+    add_column Fe::Element.table_name, :rating_after_label, :text
+    add_column Fe::Element.table_name, :rating_na_label, :text
+    add_column Fe::Element.table_name, :rating_before_label_translations, :text
+    add_column Fe::Element.table_name, :rating_after_label_translations, :text
+    add_column Fe::Element.table_name, :rating_na_label_translations, :text
+  end
+end

data/db/migrate/20181108201746_create_versions.rb

@@ -0,0 +1,80 @@
+# This migration creates the `versions` table, the only schema PT requires.
+# All other migrations PT provides are optional.
+class CreateVersions < ActiveRecord::Migration[4.2]
+  # Class names of MySQL adapters.
+  # - `MysqlAdapter` - Used by gems: `mysql`, `activerecord-jdbcmysql-adapter`.
+  # - `Mysql2Adapter` - Used by `mysql2` gem.
+  MYSQL_ADAPTERS = [
+    "ActiveRecord::ConnectionAdapters::MysqlAdapter",
+    "ActiveRecord::ConnectionAdapters::Mysql2Adapter"
+  ].freeze
+
+  # The largest text column available in all supported RDBMS is
+  # 1024^3 - 1 bytes, roughly one gibibyte.  We specify a size
+  # so that MySQL will use `longtext` instead of `text`.  Otherwise,
+  # when serializing very large objects, `text` might not be big enough.
+  TEXT_BYTES = 1_073_741_823
+
+  def change
+    create_table :versions, versions_table_options do |t|
+      t.string   :item_type, item_type_options
+      t.integer  :item_id,   null: false
+      t.string   :event,     null: false
+      t.string   :whodunnit
+      t.text     :object, limit: TEXT_BYTES
+
+      # Known issue in MySQL: fractional second precision
+      # -------------------------------------------------
+      #
+      # MySQL timestamp columns do not support fractional seconds unless
+      # defined with "fractional seconds precision". MySQL users should manually
+      # add fractional seconds precision to this migration, specifically, to
+      # the `created_at` column.
+      # (https://dev.mysql.com/doc/refman/5.6/en/fractional-seconds.html)
+      #
+      # MySQL users should also upgrade to rails 4.2, which is the first
+      # version of ActiveRecord with support for fractional seconds in MySQL.
+      # (https://github.com/rails/rails/pull/14359)
+      #
+      t.datetime :created_at
+    end
+    add_index :versions, [:item_type, :item_id]
+  end
+
+  private
+
+  # MySQL 5.6 utf8mb4 limit is 191 chars for keys used in indexes.
+  # See https://github.com/airblade/paper_trail/issues/651
+  def item_type_options
+    opt = { null: false }
+    opt[:limit] = 191 if mysql?
+    opt
+  end
+
+  def mysql?
+    MYSQL_ADAPTERS.include?(connection.class.name)
+  end
+
+  # Even modern versions of MySQL still use `latin1` as the default character
+  # encoding. Many users are not aware of this, and run into trouble when they
+  # try to use PaperTrail in apps that otherwise tend to use UTF-8. Postgres, by
+  # comparison, uses UTF-8 except in the unusual case where the OS is configured
+  # with a custom locale.
+  #
+  # - https://dev.mysql.com/doc/refman/5.7/en/charset-applications.html
+  # - http://www.postgresql.org/docs/9.4/static/multibyte.html
+  #
+  # Furthermore, MySQL's original implementation of UTF-8 was flawed, and had
+  # to be fixed later by introducing a new charset, `utf8mb4`.
+  #
+  # - https://mathiasbynens.be/notes/mysql-utf8mb4
+  # - https://dev.mysql.com/doc/refman/5.5/en/charset-unicode-utf8mb4.html
+  #
+  def versions_table_options
+    if mysql?
+      { options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci" }
+    else
+      {}
+    end
+  end
+end

data/db/migrate/20181218201130_increase_slug_length.rb

@@ -0,0 +1,5 @@
+class IncreaseSlugLength < ActiveRecord::Migration
+  def change
+    change_column Fe::Question.table_name, :slug, :string, limit: 128
+  end
+end

data/lib/fe/engine.rb

@@ -8,7 +8,7 @@ module Fe
     # Using the si as an example:
     #
     # si/app/controllers/fe/test_controller.rb
-    # 
+    #
     #   class Fe::TestController < ApplicationController
     #     def index
     #     end
@@ -22,15 +22,15 @@ module Fe
     # http://crypt.codemancers.com/posts/2013-09-22-isolate-namespace-in-rails-engines/
     # it's a real pain to extend an isolated namespace engine from the app:
     #
-    #   "Other issues include extending models and controllers. Rails 
+    #   "Other issues include extending models and controllers. Rails
     #   guides gives two options here. One to use class_eval, and other
-    #   to use concerns introduced in Rails 4. Both are kind of hacky. 
+    #   to use concerns introduced in Rails 4. Both are kind of hacky.
     #   Hope there is a better solution."
-    # 
+    #
     # and as per a user comment on that page:
     #
     #   "I've had a similar experience with `isolate_namespace`, if the engines
-    #   need to be truely isolated it works, but if you need to extend the engine 
+    #   need to be truely isolated it works, but if you need to extend the engine
     #   from the client app its best to remove it and just namespace manually.
     #
     # I'm disabling the isolate_namespace
@@ -59,18 +59,18 @@ module Fe
     end
 
     config.generators do |g|
-      g.test_framework      :rspec,        :fixture => false
-      g.fixture_replacement :factory_girl, :dir => 'spec/factories'
+      g.test_framework      :rspec,        fixture: false
+      g.fixture_replacement :factory_bot, dir: 'spec/factories'
       g.assets false
       g.helper false
     end
 
     initializer "fe.asset_precompile_paths" do |app|
       app.config.assets.precompile += %w(fe/admin.js fe/fe.screen.css)
-    end 
+    end
 
-    initializer "model_core.factories", :after => "factory_girl.set_factory_paths" do
-      FactoryGirl.definition_file_paths << File.expand_path('../../../spec/factories', __FILE__) if defined?(FactoryGirl)
+    initializer "model_core.factories", after: "factory_bot.set_factory_paths" do
+      FactoryBot.definition_file_paths << File.expand_path('../../../spec/factories', __FILE__) if defined?(FactoryBot)
     end
   end
 end

data/lib/fe/version.rb

@@ -1,3 +1,3 @@
 module Fe
-  VERSION = "1.0.0"
+  VERSION = "2.0.0"
 end

data/lib/fe.rb

@@ -5,7 +5,7 @@ module Fe
   # prefix for database tables
   mattr_accessor :table_name_prefix
   self.table_name_prefix ||= 'fe_'
-  
+
   mattr_accessor :answer_sheet_class
   self.answer_sheet_class ||= 'Fe::Application'
 
@@ -23,4 +23,10 @@ module Fe
 
     "#{prefix} #{max.next}"
   end
+
+  mattr_accessor :date_format
+  self.date_format = 'yy-mm-dd'
+
+  mattr_accessor :bootstrap
+  self.bootstrap = false
 end

data/spec/controllers/fe/admin/elements_controller_spec.rb

@@ -10,7 +10,7 @@ describe Fe::Admin::ElementsController, type: :controller do
       element = create(:text_field_element)
       create(:page_element, element: element, page: page)
 
-      xhr :get, :edit, question_sheet_id: question_sheet.id, page_id: page.id, id: element.id
+      get :edit, params: {question_sheet_id: question_sheet.id, page_id: page.id, id: element.id}, xhr: true
       expect(assigns(:element)).to eq(element)
     end
   end
@@ -20,11 +20,13 @@ describe Fe::Admin::ElementsController, type: :controller do
       page = create(:page)
       question_sheet = page.question_sheet
       create(:answer_sheet_question_sheet, answer_sheet: answer_sheet, question_sheet: question_sheet)
-      element = create(:text_field_element, style: 'style')
-      create(:page_element, element: element, page: page)
+      element1 = create(:text_field_element, style: 'style', share: true)
+      element2 = create(:text_field_element, style: 'style', share: false)
+      create(:page_element, element: element1, page: page)
+      create(:page_element, element: element2, page: page)
 
-      xhr :get, :new, element_type: 'Fe::TextField', element: { style: 'style' }, question_sheet_id: question_sheet.id, page_id: page.id
-      expect(assigns(:questions)).to eq([element])
+      get :new, params: {element_type: 'Fe::TextField', element: { style: 'style' }, question_sheet_id: question_sheet.id, page_id: page.id}, xhr: true
+      expect(assigns(:questions)).to eq([element1])
     end
   end
   context '#use_existing' do
@@ -35,19 +37,27 @@ describe Fe::Admin::ElementsController, type: :controller do
       create(:answer_sheet_question_sheet, answer_sheet: answer_sheet, question_sheet: question_sheet)
       element = create(:text_field_element, style: 'style')
 
-      xhr :get, :use_existing, question_sheet_id: question_sheet.id, page_id: page.id, id: element.id
+      get :use_existing, params: {question_sheet_id: question_sheet.id, page_id: page.id, id: element.id}, xhr: true
       expect(assigns(:page_element)).to_not be_nil
+      expect(assigns(:page_element)).to_not be_nil
+      expect(assigns(:page)).to eq(page)
+      expect(assigns(:page_element).element).to eq(element)
     end
-    it 'should not put the same question on a questionnaire twice' do
+  end
+  context '#copy_existing' do
+    it 'should work' do
       answer_sheet = create(:answer_sheet)
       page = create(:page)
       question_sheet = page.question_sheet
       create(:answer_sheet_question_sheet, answer_sheet: answer_sheet, question_sheet: question_sheet)
-      element = create(:text_field_element, style: 'style')
-      create(:page_element, element: element, page: page)
+      element = create(:text_field_element, style: 'style', share: true)
 
-      xhr :get, :use_existing, question_sheet_id: question_sheet.id, page_id: page.id, id: element.id
-      expect(assigns(:page_element)).to be_nil
+      get :copy_existing, params: {question_sheet_id: question_sheet.id, page_id: page.id, id: element.id}, xhr: true
+      expect(assigns(:page_element)).to_not be_nil
+      expect(assigns(:page_element)).to_not be_nil
+      expect(assigns(:page)).to eq(page)
+      expect(assigns(:page_element).element).to_not eq(element)
+      expect(assigns(:page_element).element.share).to be false
     end
   end
   context '#create' do
@@ -58,7 +68,7 @@ describe Fe::Admin::ElementsController, type: :controller do
       create(:answer_sheet_question_sheet, answer_sheet: answer_sheet, question_sheet: question_sheet)
 
       expect {
-        xhr :post, :create, element_type: 'Fe::TextField', element: { style: 'style' }, question_sheet_id: question_sheet.id, page_id: page.id
+        post :create, params: {element_type: 'Fe::TextField', element: { style: 'style' }, question_sheet_id: question_sheet.id, page_id: page.id}, xhr: true
       }.to change{Fe::Element.count}.by(1)
 
       expect(assigns(:page_element)).to_not be_nil
@@ -73,7 +83,7 @@ describe Fe::Admin::ElementsController, type: :controller do
       create(:answer_sheet_question_sheet, answer_sheet: answer_sheet, question_sheet: question_sheet)
 
       expect {
-        xhr :post, :create, element_type: 'Fe::TextField', element: { slug: "Illegal Chars: #@$!" }, question_sheet_id: question_sheet.id, page_id: page.id
+        post :create, params: {element_type: 'Fe::TextField', element: { slug: "Illegal Chars: #@$!" }, question_sheet_id: question_sheet.id, page_id: page.id}, xhr: true
       }.to change{Fe::Element.count}.by(0)
 
       expect(assigns(:page_element)).to be_nil
@@ -89,7 +99,7 @@ describe Fe::Admin::ElementsController, type: :controller do
       element = create(:text_field_element, style: 'style')
       create(:page_element, element: element, page: page)
 
-      xhr :put, :update, element: { style: 'style' }, question_sheet_id: question_sheet.id, page_id: page.id, id: element.id
+      put :update, params: {element: { style: 'style' }, question_sheet_id: question_sheet.id, page_id: page.id, id: element.id}, xhr: true
 
       expect(assigns(:element)).to eq(element)
       expect(assigns(:element).style).to eq('style')
@@ -102,7 +112,7 @@ describe Fe::Admin::ElementsController, type: :controller do
       element = create(:text_field_element, style: 'style')
       create(:page_element, element: element, page: page)
 
-      xhr :put, :update, element: { slug: "Illegal Chars: #@$!" }, question_sheet_id: question_sheet.id, page_id: page.id, id: element.id
+      put :update, params: {element: { slug: "Illegal Chars: #@$!" }, question_sheet_id: question_sheet.id, page_id: page.id, id: element.id}, xhr: true
       expect(assigns(:element)).to eq(element)
       expect(response).to render_template('error.js.erb')
     end
@@ -116,7 +126,7 @@ describe Fe::Admin::ElementsController, type: :controller do
       element = create(:text_field_element, style: 'style')
       create(:page_element, element: element, page: page)
 
-      xhr :delete, :destroy, question_sheet_id: question_sheet.id, page_id: page.id, id: element.id
+      delete :destroy, params: {question_sheet_id: question_sheet.id, page_id: page.id, id: element.id}, xhr: true
 
       expect(Fe::PageElement.find_by(page_id: page.id, element_id: element.id)).to be_nil
       expect(Fe::Element.find_by(id: element.id)).to be_nil
@@ -130,7 +140,7 @@ describe Fe::Admin::ElementsController, type: :controller do
       create(:page_element, element: element, page: page)
       create(:answer, question: element, value: 'answer here', answer_sheet: answer_sheet)
 
-      xhr :delete, :destroy, question_sheet_id: question_sheet.id, page_id: page.id, id: element.id
+      delete :destroy, params: {question_sheet_id: question_sheet.id, page_id: page.id, id: element.id}, xhr: true
 
       expect(Fe::PageElement.find_by(page_id: page.id, element_id: element.id)).to be_nil
       expect(Fe::Element.find_by(id: element.id)).to_not be_nil
@@ -145,7 +155,7 @@ describe Fe::Admin::ElementsController, type: :controller do
       create(:page_element, element: element, page: page)
       create(:page_element, element: element, page: page2)
 
-      xhr :delete, :destroy, question_sheet_id: question_sheet.id, page_id: page.id, id: element.id
+      delete :destroy, params: {question_sheet_id: question_sheet.id, page_id: page.id, id: element.id}, xhr: true
 
       expect(Fe::PageElement.find_by(page_id: page.id, element_id: element.id)).to be_nil
       expect(Fe::Element.find_by(id: element.id)).to_not be_nil
@@ -169,7 +179,7 @@ describe Fe::Admin::ElementsController, type: :controller do
 
       page_element_positions_before = Fe::PageElement.all.pluck(:position)
 
-      xhr :post, :reorder, question_sheet_id: question_sheet.id, page_id: page.id, "questions_list_#{element3.id}" => [ element5.id, element4.id ]
+      post :reorder, params: {question_sheet_id: question_sheet.id, page_id: page.id, "questions_list_#{element3.id}" => [ element5.id, element4.id ]}, xhr: true
       # it shouldn't touch the page elements
       expect(Fe::PageElement.all.pluck(:position)).to eq(page_element_positions_before)
       # it should put a new order on the question grid elements
@@ -192,7 +202,7 @@ describe Fe::Admin::ElementsController, type: :controller do
 
       question_grid_elements_positions_before = element3.reload.elements.pluck(:position)
 
-      xhr :post, :reorder, question_sheet_id: question_sheet.id, page_id: page.id, "questions_list" => [ element3.id, element.id, element2.id ]
+      post :reorder, params: {question_sheet_id: question_sheet.id, page_id: page.id, "questions_list" => [ element3.id, element.id, element2.id ]}, xhr: true
       # it shouldn't touch the question grid positions
       expect(element3.reload.elements.pluck(:position)).to eq(question_grid_elements_positions_before)
       # it should put a new order on the page elements

data/spec/controllers/fe/admin/email_templates_controller_spec.rb

@@ -10,7 +10,7 @@ describe Fe::Admin::EmailTemplatesController, type: :controller do
       expect(assigns(:email_templates)).to eq([email_template])
     end
   end
-  
+
   context '#new' do
     it 'should work' do
       get :new
@@ -21,7 +21,7 @@ describe Fe::Admin::EmailTemplatesController, type: :controller do
   context '#create' do
     it 'should work' do
       expect {
-        post :create, email_template: { name: 'Name', subject: 'Subject', content: 'Content' }
+        post :create, params: {email_template: { name: 'Name', subject: 'Subject', content: 'Content' }}
       }.to change{Fe::EmailTemplate.count}.by(1)
       expect(assigns(:email_template)).to_not be_nil
     end

data/spec/controllers/fe/admin/question_pages_controller_spec.rb

@@ -5,7 +5,7 @@ describe Fe::Admin::QuestionPagesController, type: :controller do
     it 'should work' do
       page = create(:page)
       question_sheet = page.question_sheet
-      xhr :get, :show, question_sheet_id: question_sheet.id, id: page.id
+      get :show, params: {question_sheet_id: question_sheet.id, id: page.id}, xhr: true
     end
   end
 end

data/spec/controllers/fe/admin/question_sheets_controller_spec.rb

@@ -16,7 +16,7 @@ describe Fe::Admin::QuestionSheetsController, type: :controller do
     it 'should work' do
       active_qs = create(:question_sheet, archived: false)
       request.env["HTTP_REFERER"] = '/'
-      post :archive, id: active_qs.id
+      post :archive, params: {id: active_qs.id}
       expect(active_qs.reload.archived).to be true
     end
   end
@@ -24,7 +24,7 @@ describe Fe::Admin::QuestionSheetsController, type: :controller do
     it 'should work' do
       active_qs = create(:question_sheet, archived: true)
       request.env["HTTP_REFERER"] = '/'
-      post :unarchive, id: active_qs.id
+      post :unarchive, params: {id: active_qs.id}
       expect(active_qs.reload.archived).to be false
     end
   end
@@ -33,7 +33,7 @@ describe Fe::Admin::QuestionSheetsController, type: :controller do
       qs = create(:question_sheet)
       request.env["HTTP_REFERER"] = '/'
       expect {
-        post :duplicate, id: qs.id
+        post :duplicate, params: {id: qs.id}
       }.to change{Fe::QuestionSheet.count}.by(1)
       expect(Fe::QuestionSheet.last.label).to eq("#{qs.label} - COPY")
     end
@@ -43,7 +43,7 @@ describe Fe::Admin::QuestionSheetsController, type: :controller do
       qs = create(:question_sheet)
       p1 = create(:page, question_sheet: qs)
       p2 = create(:page, question_sheet: qs)
-      get :show, id: qs.id
+      get :show, params: {id: qs.id}
       expect(assigns(:all_pages)).to eq([p1, p2])
       expect(assigns(:page)).to eq(p1)
     end

data/spec/controllers/fe/answer_pages_controller_spec.rb

@@ -2,53 +2,82 @@ require 'rails_helper'
 
 describe Fe::AnswerPagesController, type: :controller do
   context '#edit' do
+    let(:answer_sheet) { create(:answer_sheet) }
+    let(:page) { create(:page) }
+
     it 'should work' do
-      answer_sheet = create(:answer_sheet)
-      page = create(:page)
       question_sheet = page.question_sheet
       create(:answer_sheet_question_sheet, answer_sheet: answer_sheet, question_sheet: question_sheet)
-      get :edit, id: page.id, answer_sheet_id: answer_sheet.id
+      get :edit, params: {id: page.id, answer_sheet_id: answer_sheet.id}
       expect(response).to render_template('fe/answer_pages/_answer_page')
     end
+    context 'filtering' do
+      let(:el_confidential) { create(:text_field_element, is_confidential: true) }
+      let(:el_visible) { create(:text_field_element, is_confidential: false) }
+      let(:el_visible2) { create(:text_field_element, is_confidential: false) }
+
+      before do
+        page.elements << el_confidential << el_visible << el_visible2
+        question_sheet = page.question_sheet
+        create(:answer_sheet_question_sheet, answer_sheet: answer_sheet, question_sheet: question_sheet)
+      end
+
+      it 'should filter out elements' do
+        allow_any_instance_of(Fe::AnswerPagesController).to receive(:get_filter).and_return(filter_default: :show, filter: [ :is_confidential ])
+        get :edit, params: {id: page.id, answer_sheet_id: answer_sheet.id}
+        expect(assigns(:elements)).to_not include(el_confidential)
+        expect(assigns(:elements)).to include(el_visible)
+        expect(assigns(:elements)).to include(el_visible2)
+      end
+      it 'should filter in elements' do
+        allow_any_instance_of(Fe::AnswerPagesController).to receive(:get_filter).and_return(filter_default: :hide, filter: [ :is_confidential ])
+        get :edit, params: {id: page.id, answer_sheet_id: answer_sheet.id}
+        expect(assigns(:elements)).to include(el_confidential)
+        expect(assigns(:elements)).to_not include(el_visible)
+        expect(assigns(:elements)).to_not include(el_visible2)
+      end
+    end
   end
+
   context '#update' do
-    it 'should work' do
-      answer_sheet = create(:answer_sheet)
-      page = create(:page)
-      question_sheet = page.question_sheet
+    let(:answer_sheet) { create(:answer_sheet) }
+    let(:page) { create(:page) }
+    let(:question_sheet) { question_sheet = page.question_sheet }
+    let(:element) { create(:text_field_element) }
+
+    before do
       create(:answer_sheet_question_sheet, answer_sheet: answer_sheet, question_sheet: question_sheet)
-      element = create(:text_field_element)
       create(:page_element, element: element, page: page)
+    end
+
+    it 'should work' do
       # ref
       reference_question = create(:reference_question)
       reference_sheet = create(:reference_sheet, applicant_answer_sheet_id: answer_sheet.id, email: 'initial@ref.com')
 
-      xhr :put, :update, {
-        answers: { "#{element.id}" => 'answer here' },
-        reference: { "#{reference_sheet.id}" => {
-          relationship: 'roommate',
-          title: 'A',
-          first_name: 'FN',
-          last_name: 'LN',
-          phone: 'phone',
-          email: 'email@reference.com'
-        } },
-        id: page.id,
-        answer_sheet_id: answer_sheet.id
-      }
+      expect {
+        put :update, params: {
+          answers: { "#{element.id}" => 'answer here' },
+          reference: { "#{reference_sheet.id}" => {
+            relationship: 'roommate',
+            title: 'A',
+            first_name: 'FN',
+            last_name: 'LN',
+            phone: 'phone',
+            email: 'email@reference.com'
+          } },
+          id: page.id,
+          answer_sheet_id: answer_sheet.id
+        }, xhr: true
+      }.to have_enqueued_job(Fe::UpdateReferenceSheetVisibilityJob)
 
       expect(response).to render_template('fe/answer_pages/update')
       expect(Fe::Answer.find_by(answer_sheet_id: answer_sheet.id, question_id: element.id).value).to eq('answer here')
       expect(reference_sheet.reload.email).to eq('email@reference.com')
     end
+
     it 'should store a reference sheet answer' do
       # create a normal applicant sheet to make sure the answer isn't saved to that
-      answer_sheet = create(:answer_sheet)
-      page = create(:page)
-      question_sheet = page.question_sheet
-      create(:answer_sheet_question_sheet, answer_sheet: answer_sheet, question_sheet: question_sheet)
-      element = create(:text_field_element)
-      create(:page_element, element: element, page: page)
       # ref
       ref_page = create(:page, label: 'Ref Page')
       ref_question_sheet = ref_page.question_sheet
@@ -57,12 +86,12 @@ describe Fe::AnswerPagesController, type: :controller do
       reference_question = create(:reference_question, related_question_sheet_id: ref_question_sheet.id)
       reference_sheet = create(:reference_sheet, question_id: reference_question.id, applicant_answer_sheet_id: answer_sheet.id, email: 'initial@ref.com')
 
-      xhr :put, :update, {
+      put :update, params: {
         answers: { "#{ref_element.id}" => 'ref answer here' },
         id: ref_page.id,
         answer_sheet_id: reference_sheet.id,
         answer_sheet_type: 'Fe::ReferenceSheet'
-      }
+      }, xhr: true
 
       expect(response).to render_template('fe/answer_pages/update')
       expect(Fe::Answer.find_by(answer_sheet_id: reference_sheet.id, question_id: ref_element.id).value).to eq('ref answer here')
@@ -71,6 +100,33 @@ describe Fe::AnswerPagesController, type: :controller do
       expect(reference_sheet.reload.answers.collect(&:value)).to eq(['ref answer here'])
       expect(answer_sheet.reload.answers).to eq([])
     end
-  end
+    context 'when filling out a reference' do
+      it 'should not reset the reference even when the email changes' do
+        # ref
+        ref_page = create(:page, label: 'Ref Page')
+        ref_question_sheet = ref_page.question_sheet
+        ref_element = create(:text_field_element, object_name: 'answer_sheet', attribute_name: 'email')
+        create(:page_element, element: ref_element, page: ref_page)
+        reference_question = create(:reference_question, related_question_sheet_id: ref_question_sheet.id)
+        reference_sheet = create(:reference_sheet, question_id: reference_question.id, applicant_answer_sheet_id: answer_sheet.id, email: 'initial@ref.com')
+        reference_sheet.generate_access_key
+        reference_sheet.save!
+        key_before = reference_sheet.access_key
+
+        put :update, params: {
+          answers: { "#{ref_element.id}" => 'other@email.com' },
+          id: ref_page.id,
+          answer_sheet_id: reference_sheet.id,
+          answer_sheet_type: 'Fe::ReferenceSheet',
+          a: reference_sheet.access_key
+        }, xhr: true
 
+        expect(response).to render_template('fe/answer_pages/update')
+        reference_sheet.reload
+        expect(reference_sheet.email).to eq('other@email.com')
+        # make sure the access key isn't reset
+        expect(reference_sheet.access_key).to eq(key_before)
+      end
+    end
+  end
 end