fe 1.0.0 → 2.0.0

data/spec/factories/answer_sheet_question_sheets.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :answer_sheet_question_sheet, class: Fe::AnswerSheetQuestionSheet do
   end
 end

data/spec/factories/answer_sheets.rb

@@ -1,5 +1,5 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :answer_sheet, class: Fe::Application do
-    created_at Time.now
+    created_at { Time.now }
   end
 end

data/spec/factories/answers.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :answer, class: Fe::Answer do
   end
 end

data/spec/factories/applications.rb

@@ -1,6 +1,6 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
+# Read about factories at https://github.com/thoughtbot/factory_bot
 
-FactoryGirl.define do
-  factory :application, :class => 'Fe::Application' do
+FactoryBot.define do
+  factory :application, class: 'Fe::Application' do
   end
 end

data/spec/factories/dummy_applications.rb

@@ -1,6 +1,6 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
+# Read about factories at https://github.com/thoughtbot/factory_bot
 
-FactoryGirl.define do
-  factory :dummy_application, :class => 'Application' do
+FactoryBot.define do
+  factory :dummy_application, class: 'Application' do
   end
 end

data/spec/factories/dummy_people.rb

@@ -1,6 +1,6 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
+# Read about factories at https://github.com/thoughtbot/factory_bot
 
-FactoryGirl.define do
-  factory :dummy_person, :class => 'Person' do
+FactoryBot.define do
+  factory :dummy_person, class: 'Person' do
   end
 end

data/spec/factories/dummy_users.rb

@@ -1,6 +1,6 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
+# Read about factories at https://github.com/thoughtbot/factory_bot
 
-FactoryGirl.define do
-  factory :dummy_user, :class => 'User' do
+FactoryBot.define do
+  factory :dummy_user, class: 'User' do
   end
 end

data/spec/factories/elements.rb

@@ -1,44 +1,44 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :element, class: Fe::Element do
     sequence    :label do |n| "Label Element #{n}" end
-    required    true
+    required    { true }
 
     factory :choice_field_element, class: Fe::ChoiceField do
-      kind    "Fe::ChoiceField"
-      style   "yes-no"
-      content "Choice One\r\nChoice Two\r\nChoice Three"
+      kind    { "Fe::ChoiceField" }
+      style   { "yes-no" }
+      content { "Choice One\r\nChoice Two\r\nChoice Three" }
     end
     factory :date_field_element, class: Fe::DateField do
-      kind    "Fe::DateField"
-      style   "date"
+      kind    { "Fe::DateField" }
+      style   { "date" }
     end
     factory :text_field_element, class: Fe::TextField do
-      kind   "Fe::TextField"
-      style  "short"
+      kind   { "Fe::TextField" }
+      style  { "short" }
     end
     factory :question_grid, class: Fe::QuestionGrid do
-      kind   "Fe::QuestionGrid"
-      style  "grid"
+      kind   { "Fe::QuestionGrid" }
+      style  { "grid" }
     end
     factory :question_grid_with_total, class: Fe::QuestionGridWithTotal do
-      kind   "Fe::QuestionGridWithTotal"
-      style  "grid"
+      kind   { "Fe::QuestionGridWithTotal" }
+      style  { "grid" }
     end
     factory :reference_element, class: Fe::ReferenceQuestion do
-      kind   "Fe::ReferenceQuestion"
-      style  "staff"
+      kind   { "Fe::ReferenceQuestion" }
+      style  { "staff" }
     end
     factory :section, class: Fe::Section do
-      kind   "Fe::Section"
-      style  "section"
+      kind   { "Fe::Section" }
+      style  { "section" }
     end
     factory :attachment_field_element, class: Fe::AttachmentField do
-      kind   "Fe::AttachmentField"
-      style  "section"
+      kind   { "Fe::AttachmentField" }
+      style  { "section" }
     end
     factory :state_chooser_element, class: Fe::StateChooser do
-      kind   "Fe::StateChooser"
-      style  "section"
+      kind   { "Fe::StateChooser" }
+      style  { "section" }
     end
   end
 end

data/spec/factories/email_templates.rb

@@ -1,5 +1,5 @@
-FactoryGirl.define do
-  factory :email_template, :class => 'Fe::EmailTemplate' do
-    name "Staff Payment Request"
+FactoryBot.define do
+  factory :email_template, class: 'Fe::EmailTemplate' do
+    name { "Staff Payment Request" }
   end
 end

data/spec/factories/fe_addresses.rb

@@ -1,14 +1,14 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
+# Read about factories at https://github.com/thoughtbot/factory_bot
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :fe_address, class: Fe::Address do
-    address1 "MyString"
-    address2 "MyString"
-    address3 "MyString"
-    address4 "MyString"
-    city "MyString"
-    state "MyString"
-    zip "MyString"
-    country "MyString"
+    address1 { "MyString" }
+    address2 { "MyString" }
+    address3 { "MyString" }
+    address4 { "MyString" }
+    city { "MyString" }
+    state { "MyString" }
+    zip { "MyString" }
+    country { "MyString" }
   end
 end

data/spec/factories/fe_email_addresses.rb

@@ -1,7 +1,7 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
+# Read about factories at https://github.com/thoughtbot/factory_bot
 
-FactoryGirl.define do
-  factory :fe_email_address, :class => Fe::EmailAddress do
+FactoryBot.define do
+  factory :fe_email_address, class: Fe::EmailAddress do
     sequence(:email) { |n| "email_#{n}@email.com" }
   end
 end

data/spec/factories/fe_email_templates.rb

@@ -1,9 +1,9 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
+# Read about factories at https://github.com/thoughtbot/factory_bot
 
-FactoryGirl.define do
-  factory :fe_email_template, :class => Fe::EmailTemplate do
+FactoryBot.define do
+  factory :fe_email_template, class: Fe::EmailTemplate do
     sequence(:content) { |n| "content_#{n}" }
     sequence(:subject) { |n| "subject#{n}" }
-    enabled true
+    enabled { true }
   end
 end

data/spec/factories/fe_people.rb

@@ -1,8 +1,8 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
+# Read about factories at https://github.com/thoughtbot/factory_bot
 
-FactoryGirl.define do
-  factory :fe_person, :class => 'Fe::Person' do
-    first_name "MyString"
-    last_name "MyString"
+FactoryBot.define do
+  factory :fe_person, class: 'Fe::Person' do
+    first_name { "MyString" }
+    last_name { "MyString" }
   end
 end

data/spec/factories/fe_phone_numbers.rb

@@ -1,7 +1,7 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
+# Read about factories at https://github.com/thoughtbot/factory_bot
 
-FactoryGirl.define do
-  factory :fe_phone_number, :class => Fe::PhoneNumber do
+FactoryBot.define do
+  factory :fe_phone_number, class: Fe::PhoneNumber do
     sequence(:number) { |n| "#{n}" * 6 }
   end
 end

data/spec/factories/fe_user.rb

@@ -1,6 +1,6 @@
-# Read about factories at https://github.com/thoughtbot/factory_girl
+# Read about factories at https://github.com/thoughtbot/factory_bot
 
-FactoryGirl.define do
-  factory :fe_user, :class => 'Fe::User' do
+FactoryBot.define do
+  factory :fe_user, class: 'Fe::User' do
   end
 end

data/spec/factories/page.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
 
   factory :page, class: Fe::Page do
     sequence :label do |n| "Label Page #{n}" end

data/spec/factories/page_elements.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :page_element, class: Fe::PageElement do
   end
 end

data/spec/factories/paragraphs.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do 
+FactoryBot.define do 
   factory :paragraph, class: Fe::Paragraph do
   end
 end

data/spec/factories/question_sheet.rb

@@ -1,10 +1,10 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :question_sheet, class: Fe::QuestionSheet do
     sequence(:label) { |n| "Question Sheet #{n}"}
 
     factory :question_sheet_with_pages do
       transient do
-        pages_count 5
+        pages_count { 5 }
       end
 
       after(:create) do |question_sheet, evaluator|

data/spec/factories/reference_questions.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do 
+FactoryBot.define do 
   factory :reference_question, class: Fe::ReferenceQuestion do
   end
 end

data/spec/factories/reference_sheets.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do 
+FactoryBot.define do 
   factory :reference_sheet, class: Fe::ReferenceSheet do
     sequence(:email) { |n| "email_#{n}@email.com" }
     sequence(:first_name) { |n| "fn_#{n}" }

data/spec/jobs/fe/update_reference_sheet_visibility_job_spec.rb

@@ -0,0 +1,40 @@
+require "rails_helper"
+
+RSpec.describe Fe::UpdateReferenceSheetVisibilityJob, type: :job do
+  it "matches with enqueued job" do
+    expect {
+      Fe::UpdateReferenceSheetVisibilityJob.perform_later(create(:application), [1])
+    }.to have_enqueued_job(Fe::UpdateReferenceSheetVisibilityJob)
+  end
+
+  context '#perform' do
+    let(:qs) { create(:question_sheet_with_pages) }
+    let(:qs2) { create(:question_sheet_with_pages) }
+    let(:p) { qs.pages.first }
+    let(:p2) { qs.pages.first }
+    let(:ref_el) { create(:reference_element) }
+    let(:ref_el2) { create(:reference_element) }
+    let(:ref_el3) { create(:reference_element) }
+    let(:app) { create(:application) }
+    let(:affecting_el) { create(:text_field_element) }
+
+    before do
+      p.elements << ref_el
+      p2.elements << ref_el2
+      app.question_sheets << qs << qs2
+    end
+
+    it "calls update_visible for all refs whose visibility_affecting_element_ids include the answer's question" do
+      expect(app).to receive(:question_sheets_all_reference_elements).and_return([ref_el, ref_el2])
+      expect(ref_el).to receive(:visibility_affecting_element_ids).and_return([affecting_el.id])
+      expect(ref_el).to receive(:update_visible)
+      ref_el_arr = [ref_el]
+      allow(app).to receive(:all_references).and_return(ref_el_arr)
+      allow(ref_el_arr).to receive(:where).with(question_id: ref_el.id).and_return(ref_el_arr)
+      expect(ref_el2).to receive(:visibility_affecting_element_ids).and_return([])
+      qs = Fe::QuestionSet.new([affecting_el], app)
+      puts app.object_id
+      Fe::UpdateReferenceSheetVisibilityJob.new.perform(app, qs.questions.collect(&:id))
+    end
+  end
+end

data/spec/models/fe/answer_sheet_question_sheet_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe Fe::AnswerSheetQuestionSheet do
+describe Fe::AnswerSheetQuestionSheet, type: :model do
   it { expect belong_to :answer_sheet }
   it { expect belong_to :question_sheet }
 end

data/spec/models/fe/answer_spec.rb

@@ -1,9 +1,9 @@
 require 'rails_helper'
 
-describe Fe::Answer do
+describe Fe::Answer, type: :model do
   it { expect belong_to :answer_sheet }
   it { expect belong_to :question }
-  it { expect ensure_length_of :short_value }
+  it { expect validate_length_of :short_value }
 
   it '#to_s' do
     answer = Fe::Answer.new

data/spec/models/fe/application_spec.rb

@@ -1,8 +1,101 @@
 require 'rails_helper'
 
-RSpec.describe Fe::Application, :type => :model do
+RSpec.describe Fe::Application, type: :model do
   it { expect have_many :answer_sheet_question_sheets }
   it { expect have_many :question_sheets }
   it { expect have_many :answers }
   it { expect have_many :reference_sheets }
+
+  let(:qs) { create(:question_sheet_with_pages) }
+  let(:qs2) { create(:question_sheet_with_pages) }
+  let(:p) { qs.pages.first }
+  let(:p2) { qs.pages.first }
+  let(:ref_el) { create(:reference_element) }
+  let(:ref_el2) { create(:reference_element) }
+  let(:ref_el3) { create(:reference_element) }
+  let(:app) { create(:application) }
+
+  before do
+    p.elements << ref_el
+    p2.elements << ref_el2
+    app.question_sheets << qs << qs2
+  end
+
+  context '#percentage_complete' do
+    before do
+      @q = create(:question_sheet_with_pages)
+      @p = @q.pages.first
+      @p2 = @q.pages.second
+
+      @yesno = create(:choice_field_element, required: false, label: 'yesno lvl1 hidden-gridparent') # answered
+      @grid = create(:question_grid, choice_field: @yesno, label: 'hidden grid')
+      @text1 = create(:text_field_element, label: 'lvl2 hidden required', question_grid: @grid, required: true) # NOT answered
+      @text2 = create(:text_field_element, label: 'lvl2 hidden required2', question_grid: @grid, required: true) # answered (but doesn't count because hidden)
+      @text3 = create(:text_field_element, label: 'lvl2 hidden optional', question_grid: @grid, required: false) # answered (but doesn't count because hidden)
+      
+      @text4 = create(:text_field_element, label: 'lvl1 optional', required: false) # answered
+      @text5 = create(:text_field_element, label: 'lvl1 required', required: true, object_name: 'applicant', attribute_name: 'first_name') # answered
+      @text6 = create(:text_field_element, label: 'lvl1 required2', required: true) # NOT answered
+
+      @yesno2 = create(:choice_field_element, required: false, label: 'yesno2 lvl1 visible-gridparent2') # answered
+      @grid2 = create(:question_grid, choice_field: @yesno2, label: 'visible grid')
+      @text7 = create(:text_field_element, label: 'lvl2 visible required', question_grid: @grid2, required: true) # NOT answered
+      @text8 = create(:text_field_element, label: 'lvl2 visible required2', question_grid: @grid2, required: true) # answered
+      @text9 = create(:text_field_element, label: 'lvl2 visible optional', question_grid: @grid2, required: false) # answered
+
+      @p.elements << @yesno
+      @p.elements << @yesno2
+      @p.elements << @text4
+      @p.elements << @text5
+      @p2.elements << @text6
+
+      person = create(:fe_person)
+      @a = create(:application, applicant_id: person.id)
+
+      @yesno.set_response('no', @a)
+      @yesno.save_response(@a)
+      @yesno2.set_response('yes', @a)
+      @yesno2.save_response(@a)
+      @text2.set_response('this answer is not counted, yesno parent is no so this is hidden', @a)
+      @text2.save_response(@a)
+      @text3.set_response('this answer is not counted, yesno parent is no so this is hidden', @a)
+      @text3.save_response(@a)
+      @text4.set_response('this answer is counted when optional included', @a)
+      @text4.save_response(@a)
+      @text5.set_response('this answer is counted', @a)
+      @text5.save_response(@a)
+
+      @text8.set_response('this answer is counted', @a)
+      @text8.save_response(@a)
+      @text9.set_response('this answer is counted when optional included', @a)
+      @text9.save_response(@a)
+
+      FactoryBot.create(:answer_sheet_question_sheet, answer_sheet: @a, question_sheet: @q)
+    end
+
+    it 'counts only required elements by default' do
+      @a.reload
+      expect(@a.percent_complete).to eq(50) # 2 of 4
+    end
+    it 'counts all questions, not just required ones, when specified' do
+      @a.reload
+      expect(@a.percent_complete(false)).to eq(75) # 6 of 8 (2 yes/no + 3 txts within the 1 visible grid + 2 txts directly on page, 1 on other page)
+    end
+    it 'supports specifying a page' do
+      @a.reload
+      expect(@a.percent_complete(false, [@p])).to eq(85) # 6 of 7 (2 yes/no + 3 txts within the 1 visible grid + 2 txts directly on page)
+    end
+  end
+
+  context '#question_sheets_all_reference_elements' do
+    it 'returns all reference elements for all question sheets' do
+      expect(app.question_sheets_all_reference_elements).to eq([ref_el, ref_el2])
+    end
+
+    it 'returns a reference that was just added' do
+      expect(app.question_sheets_all_reference_elements).to eq([ref_el, ref_el2])
+      p.elements << ref_el3
+      expect(app.question_sheets_all_reference_elements).to eq([ref_el, ref_el2, ref_el3])
+    end
+  end
 end

data/spec/models/fe/choice_field_spec.rb

@@ -42,11 +42,57 @@ describe Fe::ChoiceField do
     end
     if RUBY_VERSION =~ /^2/
       it 'should work for a remote source using rexml' do
-        expect(Fe::ChoiceField.new(style: 'drop-down', source: 'https://raw.githubusercontent.com/CruGlobal/qe/fe/spec/support/choices.xml', text_xpath: '*/choice', value_xpath: '*/value').choices).to eq([["A","1"],["B","0"]])
+        expect(Fe::ChoiceField.new(style: 'drop-down', source: 'https://raw.githubusercontent.com/CruGlobal/fe/master/spec/support/choices.xml', text_xpath: '*/choice', value_xpath: '*/value').choices).to eq([["A","1"],["B","0"]])
       end
     end
     it 'should work for content set' do
       expect(Fe::ChoiceField.new(style: 'drop-down', content: "1;A\n0;B").choices).to eq([["A","1"],["B","0"]])
     end
   end
+
+  context '#conditional_match' do
+    it 'returns true if any of the options from conditional_answer are selected' do
+      qs = create(:question_sheet)
+      app = create(:application)
+      app.question_sheets << qs
+      e = create(:choice_field_element, conditional_answer: 'a;b', style: 'drop-down')
+      qs.pages << create(:page)
+      qs.pages.reload.first.elements << e
+      a = create(:answer, question: e, value: 'a', answer_sheet_id: app.id)
+      a = create(:answer, question: e, value: 'b', answer_sheet_id: app.id)
+      a = create(:answer, question: e, value: 'c', answer_sheet_id: app.id)
+      expect(e.conditional_match(app)).to be true
+    end
+    it 'returns false if any of none of the options match conditional_answer' do
+      qs = create(:question_sheet)
+      app = create(:application)
+      app.question_sheets << qs
+      e = create(:choice_field_element, conditional_answer: 'a;b', style: 'drop-down')
+      qs.pages << create(:page)
+      qs.pages.reload.first.elements << e
+      a = create(:answer, question: e, value: 'c', answer_sheet_id: app.id)
+      a = create(:answer, question: e, value: 'd', answer_sheet_id: app.id)
+      expect(e.conditional_match(app)).to be false
+    end
+    it 'returns true if the conditional_answer is empty and no options are selected' do
+      qs = create(:question_sheet)
+      app = create(:application)
+      app.question_sheets << qs
+      e = create(:choice_field_element, conditional_answer: '', style: 'drop-down')
+      qs.pages << create(:page)
+      qs.pages.reload.first.elements << e
+      expect(e.conditional_match(app)).to be true
+    end
+    it 'returns true regardless of whitespace separating conditional answers' do
+      qs = create(:question_sheet)
+      app = create(:application)
+      app.question_sheets << qs
+      e = create(:choice_field_element, conditional_answer: "a; b\n", style: 'drop-down')
+      qs.pages << create(:page)
+      qs.pages.reload.first.elements << e
+      a = create(:answer, question: e, value: 'a', answer_sheet_id: app.id)
+      a = create(:answer, question: e, value: 'd', answer_sheet_id: app.id)
+      expect(e.conditional_match(app)).to be true
+    end
+  end
 end

data/spec/models/fe/condition_spec.rb

@@ -1,8 +1,8 @@
 require 'rails_helper'
 
-describe Fe::Condition do
+describe Fe::Condition, type: :model do
   it { expect belong_to :question_sheet }
   it { expect belong_to :trigger }
   it { expect validate_presence_of :expression }
-  it { expect ensure_length_of :expression }
+  it { expect validate_length_of :expression }
 end