quby 5.0.0 → 5.0.5

data/spec/features/question_dependencies/group_minimum_answered_spec.rb

@@ -15,6 +15,7 @@ shared_examples 'group_minimum_answered_tests' do
     fill_in_question('v_date_year',  '2013')
     fill_in_question('v_date_month', '12')
     fill_in_question('v_date_day',   '10')
+    set_slider_value('v_slider', '50')
     run_validations
     expect_no_errors
     expect_saved_value 'v_radio', 'a1'
@@ -27,6 +28,7 @@ shared_examples 'group_minimum_answered_tests' do
     expect_saved_value 'v_date_year', "2013"
     expect_saved_value 'v_date_month', "12"
     expect_saved_value 'v_date_day', "10"
+    # expect_saved_value 'v_slider', '50' # occasional client side rounding issue :S
   end
 
   it 'is not valid when radio question is not filled' do
@@ -41,6 +43,7 @@ shared_examples 'group_minimum_answered_tests' do
     fill_in_question('v_date_year',  '2013')
     fill_in_question('v_date_month', '12')
     fill_in_question('v_date_day',   '10')
+    set_slider_value('v_slider', '50')
     run_validations
     expect_errors_on_group
   end
@@ -57,6 +60,7 @@ shared_examples 'group_minimum_answered_tests' do
     fill_in_question('v_date_year',  '2013')
     fill_in_question('v_date_month', '12')
     fill_in_question('v_date_day',   '10')
+    set_slider_value('v_slider', '50')
     run_validations
     expect_errors_on_group
   end
@@ -73,6 +77,7 @@ shared_examples 'group_minimum_answered_tests' do
     fill_in_question('v_date_year',  '2013')
     fill_in_question('v_date_month', '12')
     fill_in_question('v_date_day',   '10')
+    set_slider_value('v_slider', '50')
     run_validations
     expect_errors_on_group
   end
@@ -89,6 +94,7 @@ shared_examples 'group_minimum_answered_tests' do
     fill_in_question('v_date_year',  '2013')
     fill_in_question('v_date_month', '12')
     fill_in_question('v_date_day',   '10')
+    set_slider_value('v_slider', '50')
     run_validations
     expect_errors_on_group
   end
@@ -105,6 +111,7 @@ shared_examples 'group_minimum_answered_tests' do
     fill_in_question('v_date_year',  '2013')
     fill_in_question('v_date_month', '12')
     fill_in_question('v_date_day',   '10')
+    set_slider_value('v_slider', '50')
     run_validations
     expect_errors_on_group
   end
@@ -121,6 +128,7 @@ shared_examples 'group_minimum_answered_tests' do
     fill_in_question('v_date_year',  '2013')
     fill_in_question('v_date_month', '12')
     fill_in_question('v_date_day',   '10')
+    set_slider_value('v_slider', '50')
     run_validations
     expect_errors_on_group
   end
@@ -137,6 +145,7 @@ shared_examples 'group_minimum_answered_tests' do
     fill_in_question('v_date_year',  '2013')
     fill_in_question('v_date_month', '12')
     fill_in_question('v_date_day',   '10')
+    set_slider_value('v_slider', '50')
     run_validations
     expect_errors_on_group
   end
@@ -153,6 +162,24 @@ shared_examples 'group_minimum_answered_tests' do
     # fill_in_question('v_date_year',  '2013')
     # fill_in_question('v_date_month', '12')
     # fill_in_question('v_date_day',   '10')
+    set_slider_value('v_slider', '50')
+    run_validations
+    expect_errors_on_group
+  end
+
+  it 'is not valid when slider question is not filled' do
+    select_radio_option 'v_radio', 'a1'
+    select_radio_option 'v_scale', 'a1'
+    select_select_option 'v_select', 'a1'
+    check_option 'v_ck_a1'
+    uncheck_option 'v_ck_a2'
+    fill_in_question 'v_string', 'kittens!'
+    fill_in_question 'v_integer', '37'
+    fill_in_question 'v_float', '4.2'
+    fill_in_question('v_date_year',  '2013')
+    fill_in_question('v_date_month', '12')
+    fill_in_question('v_date_day',   '10')
+    # set_slider_value('v_slider', '50')
     run_validations
     expect_errors_on_group
   end
@@ -166,7 +193,7 @@ shared_examples 'group_minimum_answered' do
   context 'minimum number of given answers in a group' do
     let(:questionnaire) do
       inject_questionnaire 'test', <<-END
-        n = 8
+        n = 9
 
         panel do
           question :v_radio, type: :radio, question_group: :group1, group_minimum_answered: n do
@@ -210,6 +237,12 @@ shared_examples 'group_minimum_answered' do
                             year_key: :v_date_year, month_key: :v_date_month, day_key: :v_date_day do
             title "Enter a date"
           end
+
+          question :v_slider, type: :float, as: :slider, size: 20, default_position: :hidden,
+                              question_group: :group1, group_minimum_answered: n do
+            title "Slider"
+            validates_in_range 0..100
+          end
         end; end_panel
       END
     end
@@ -220,7 +253,7 @@ shared_examples 'group_minimum_answered' do
   context 'table-based minimum number of given answers in a group' do
     let(:questionnaire) do
       inject_questionnaire 'test', <<-END
-      n = 8
+      n = 9
 
       panel do
         table columns: 20 do
@@ -266,6 +299,12 @@ shared_examples 'group_minimum_answered' do
             title "Enter a date"
           end
         end
+
+        question :v_slider, type: :float, as: :slider, size: 20, default_position: :hidden,
+                            question_group: :group1, group_minimum_answered: n do
+          title "Slider"
+          validates_in_range 0..100
+        end
       end
       end_panel
       END
@@ -352,6 +391,7 @@ shared_examples 'group_minimum_answered' do
     expect_error_on 'v_integer', 'answer_group_minimum'
     expect_error_on 'v_float', 'answer_group_minimum'
     expect_error_on 'v_date', 'answer_group_minimum'
+    expect_error_on 'v_slider', 'answer_group_minimum'
   end
 end
 

data/spec/features/question_dependencies/group_minmax_answered_spec.rb

@@ -3,35 +3,58 @@
 require 'spec_helper'
 
 shared_examples 'group_minmax_answered_tests' do
-  it 'is valid when first question is filled in' do
+  it 'is valid when radio question is not filled in' do
+    # select_radio_option 'v_radio', 'a1'
+    select_radio_option 'v_scale', 'a1'
+    set_slider_value 'v_slider', '50'
+    run_validations
+    expect_no_errors
+    # expect_saved_value 'v_radio', 'a1'
+    expect_saved_value 'v_scale', 'a1'
+  end
+
+  it 'is valid when scale question is not filled in' do
     select_radio_option 'v_radio', 'a1'
     # select_radio_option 'v_scale', 'a1'
+    set_slider_value 'v_slider', '50'
     run_validations
     expect_no_errors
     expect_saved_value 'v_radio', 'a1'
     # expect_saved_value 'v_scale', 'a1'
   end
 
-  it 'is valid when second question is filled in' do
-    # select_radio_option 'v_radio', 'a1'
+  it 'is valid when slider question is not filled in' do
+    select_radio_option 'v_radio', 'a1'
     select_radio_option 'v_scale', 'a1'
+    # set_slider_value 'v_slider', '50'
     run_validations
     expect_no_errors
-    # expect_saved_value 'v_radio', 'a1'
+    expect_saved_value 'v_radio', 'a1'
     expect_saved_value 'v_scale', 'a1'
   end
 
   it 'is not valid when no questions are filled' do
     # select_radio_option 'v_radio', 'a1'
     # select_radio_option 'v_scale', 'a1'
+    # set_slider_value 'v_slider', '50'
     run_validations
     expect_error_on 'v_radio', 'answer_group_minimum'
     expect_error_on 'v_scale', 'answer_group_minimum'
   end
 
-  it 'is not valid when both questions are filled' do
+  it 'is not valid when only one question is filled' do
+    select_radio_option 'v_radio', 'a1'
+    # select_radio_option 'v_scale', 'a1'
+    # set_slider_value 'v_slider', '50'
+    run_validations
+    expect_error_on 'v_radio', 'answer_group_minimum'
+    expect_error_on 'v_scale', 'answer_group_minimum'
+  end
+
+  it 'is not valid when all questions are filled' do
     select_radio_option 'v_radio', 'a1'
     select_radio_option 'v_scale', 'a1'
+    set_slider_value 'v_slider', '50'
     run_validations
     expect_error_on 'v_radio', 'answer_group_maximum'
     expect_error_on 'v_scale', 'answer_group_maximum'
@@ -45,7 +68,7 @@ shared_examples 'group_minmax_answered' do
   context 'normal' do
     let(:questionnaire) do
       inject_questionnaire 'test', <<-END
-        n = 1
+        n = 2
 
         panel do
           question :v_radio, type: :radio, question_group: :group1, group_minimum_answered: n,
@@ -61,6 +84,13 @@ shared_examples 'group_minmax_answered' do
             option :a1, value: 1, description: "Scale Option 1"
             option :a2, value: 2, description: "Scale Option 2"
           end
+
+          question :v_slider, type: :float, as: :slider, size: 20, default_position: :hidden,
+                            question_group: :group1, group_minimum_answered: n,
+                                                     group_maximum_answered: n do
+            title "Slider"
+            validates_in_range 0..100
+          end
         end; end_panel
       END
     end
@@ -71,7 +101,7 @@ shared_examples 'group_minmax_answered' do
   context 'table-based' do
     let(:questionnaire) do
       inject_questionnaire 'test', <<-END
-      n = 1
+      n = 2
 
       panel do
         table columns: 20 do
@@ -89,6 +119,13 @@ shared_examples 'group_minmax_answered' do
             option :a2, value: 2, description: "Scale Option 2"
           end
         end
+
+        question :v_slider, type: :float, as: :slider, size: 20, default_position: :hidden,
+                            question_group: :group1, group_minimum_answered: n,
+                                                     group_maximum_answered: n do
+          title "Slider"
+          validates_in_range 0..100
+        end
       end
       end_panel
       END

data/spec/fixtures/questionnaire_with_chart.rb

@@ -33,4 +33,5 @@ line_chart :tot do
   plot :v_3
   plotband 30, 50, :yellow
   plotband 50, 80, :red
+  plotline 20, :green
 end

data/spec/fixtures/scores_from_schema.rb

@@ -0,0 +1,25 @@
+title 'Score test'
+
+question :v_1, type: :integer
+
+score_schema :test, 'Testscore' do
+  subscore :value, 'Waarde', export_key: :tes do
+    value(:v_1)
+  end
+  subscore :interpretation, 'Waarde', export_key: :tes_i do
+    'Matig'
+  end
+end
+
+score_schema :test2, 'Testscore 2' do
+  subscore :value, 'Waarde', export_key: :tes2 do
+    values_with_nils(:v_1).first + 5
+  end
+  subscore :interpretation, 'Waarde', export_key: :tes2_i do
+    'Miniem'
+  end
+end
+
+completion do
+  values_with_nils(:v_1).compact.size / 1.0
+end

data/spec/quby/answers/entities/score_spec.rb

@@ -4,15 +4,10 @@ require 'spec_helper'
 
 module Quby::Answers::Entities
   describe Score do
-    let(:questionnaire) do
-      Quby.questionnaires.find('score_test')
-    end
-
     let(:v_1_value) { 10 }
-
     let(:answer) do
       # complicated way to get an answer
-      answer = Quby.answers.create!('score_test')
+      answer = Quby.answers.create!(questionnaire_key)
       answer.value = {'v_1' => v_1_value}
       Quby.answers.update!(answer)
       Quby.answers.regenerate_outcome!(answer)
@@ -22,56 +17,68 @@ module Quby::Answers::Entities
     # it works with indifferent access
     subject { answer.score_objects['test'] }
 
-    it 'has working completion' do
-      expect(answer.outcome.completion).to eq("value" => 1.0)
-    end
-
-    it 'exposes score schema fields' do
-      expect(subject.key).to eq(:test)
-      expect(subject.label).to eq('Testscore')
-    end
-
-    it 'exposes #referenced_values' do
-      expect(subject.referenced_values).to eq(["v_1"])
-    end
+    shared_examples 'score test' do
+      it 'has working completion' do
+        expect(answer.outcome.completion).to eq("value" => 1.0)
+      end
 
-    describe '#[] to access subscores' do
-      let(:subscore) { subject[:value] }
-      it 'exposes subscore schema fields' do
-        expect(subscore.key).to eq(:value)
-        expect(subscore.export_key).to eq(:tes)
-        expect(subscore.only_for_export).to eq(nil)
-        expect(subscore.label).to eq('Waarde')
+      it 'exposes score schema fields' do
+        expect(subject.key).to eq(:test)
+        expect(subject.label).to eq('Testscore')
       end
 
-      it 'exposes subscore values, with indifferent access' do
-        expect(subscore.value).to eq(10)
-        expect(subject['interpretation'].value).to eq('Matig')
+      it 'exposes #referenced_values' do
+        expect(subject.referenced_values).to eq(["v_1"])
       end
-    end
 
-    describe 'when the score has missing values' do
-      let(:v_1_value) { nil }
-      it 'exposes nil as the value for each subscore, and leaves schema information alone' do
-        expect(subject[:interpretation].value).to eq(nil)
-        expect(subject[:value].export_key).to eq(:tes)
-        expect(subject.key).to eq(:test)
+      describe '#[] to access subscores' do
+        let(:subscore) { subject[:value] }
+        it 'exposes subscore schema fields' do
+          expect(subscore.key).to eq(:value)
+          expect(subscore.export_key).to eq(:tes)
+          expect(subscore.only_for_export).to eq(nil)
+          expect(subscore.label).to eq('Waarde')
+        end
+
+        it 'exposes subscore values, with indifferent access' do
+          expect(subscore.value).to eq(10)
+          expect(subject['interpretation'].value).to eq('Matig')
+        end
       end
 
-      describe 'when the score has an exception' do
-        # second score will error on nil
-        subject { answer.score_objects[:test2] }
+      describe 'when the score has missing values' do
+        let(:v_1_value) { nil }
         it 'exposes nil as the value for each subscore, and leaves schema information alone' do
-          expect(subject[:value].value).to eq(nil)
-          expect(subject[:value].export_key).to eq(:tes2)
-          expect(subject.key).to eq(:test2)
+          expect(subject[:interpretation].value).to eq(nil)
+          expect(subject[:value].export_key).to eq(:tes)
+          expect(subject.key).to eq(:test)
         end
 
-        it 'exposes the exception and backtrace under #error' do
-          expect(subject.error).to match({exception: "undefined method `+' for nil:NilClass",
-                                          backtrace: an_instance_of(Array)})
+        describe 'when the score has an exception' do
+          # second score will error on nil
+          subject { answer.score_objects[:test2] }
+          it 'exposes nil as the value for each subscore, and leaves schema information alone' do
+            expect(subject[:value].value).to eq(nil)
+            expect(subject[:value].export_key).to eq(:tes2)
+            expect(subject.key).to eq(:test2)
+          end
+
+          it 'exposes the exception and backtrace under #error' do
+            expect(subject.error).to match({exception: "undefined method `+' for nil:NilClass",
+                                            backtrace: an_instance_of(Array)})
+          end
         end
       end
     end
+
+    describe 'with explicit score calculations' do
+      let(:questionnaire_key) {'score_test'}
+      it_behaves_like 'score test'
+    end
+
+    describe 'with score schema based score calculations' do
+      let(:questionnaire_key) {'scores_from_schema'}
+      it_behaves_like 'score test'
+    end
   end
 end

data/spec/quby/answers/services/answer_validator_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 
 module Quby::Answers::Services
   describe AnswerValidator do
-    let(:questionnaire) do
+    let(:default_questionnaire) do
       inject_questionnaire "test", <<-END
         panel do
           question :v_check_box, type: :check_box do
@@ -24,7 +24,7 @@ module Quby::Answers::Services
       END
     end
 
-    let(:answer_value) do
+    let(:default_answer_value) do
       { v_check_box: { v_ck_a1: 1, v_ck_a2: 0 },
         v_ck_a1: 1,
         v_ck_a2: 0,
@@ -34,12 +34,16 @@ module Quby::Answers::Services
       }
     end
 
-    let!(:answer) do
-      answer = Quby.answers.create!(questionnaire.key, value: answer_value, flags: {}, textvars: {})
+    def build_answer(questionnaire: default_questionnaire, value: default_answer_value)
+      answer = Quby.answers.create!(questionnaire.key, value: value, flags: {}, textvars: {})
       answer.extend AnswerValidations
+      answer
     end
 
-    let(:validator) { described_class.new(questionnaire, answer) }
+
+    def validator(questionnaire: default_questionnaire, answer: build_answer)
+      described_class.new(questionnaire, answer)
+    end
 
     describe '#depends_on_key_answered' do
       it 'returns true if a check box option is answered' do
@@ -64,17 +68,54 @@ module Quby::Answers::Services
 
     describe '#validate' do
       it 'sets validation errors on the answer' do
-        validator.validate
+        answer = build_answer
+        validator(answer: answer).validate
         expect(answer.errors).to_not be_empty
       end
 
       context 'when answer is aborted' do
-        before do
+        it 'skips the validate_required validation' do
+          answer = build_answer
           allow(answer).to receive(:aborted).and_return(true)
+          validator(answer: answer).validate
+          expect(answer.errors).to be_empty
         end
 
-        it 'skips the validate_required validation' do
-          validator.validate
+        it 'skips the validate_minimum_checked_required validation' do
+          questionnaire = inject_questionnaire "test", <<-END
+            question :v_ck, type: :check_box, required: true, minimum_checked_required: 2 do
+              option :v_ck_a1, value: 1
+              option :v_ck_a2, value: 2
+              option :v_ck_a3, value: 3
+            end
+          END
+
+          answer = build_answer(questionnaire: questionnaire, value: {v_ck: {v_ck_a1: 0, v_ck_a2: 0, v_ck_a3: 1}})
+          validator(questionnaire: questionnaire, answer: answer).validate
+          expect(answer.errors[:v_ck]).to include(message: "Not enough options checked.", valtype: :minimum_checked_required)
+
+          answer = build_answer(questionnaire: questionnaire, value: {v_ck: {v_ck_a1: 0, v_ck_a2: 0, v_ck_a3: 1}})
+          allow(answer).to receive(:aborted).and_return(true)
+          validator(questionnaire: questionnaire, answer: answer).validate
+          expect(answer.errors).to be_empty
+        end
+
+        it 'skips the validate_answer_group_minimum validation' do
+          questionnaire = inject_questionnaire "test", <<-END
+            question :v_1, type: :string, question_group: :grp, group_minimum_answered: 2
+            question :v_2, type: :string, question_group: :grp, group_minimum_answered: 2
+            question :v_3, type: :string, question_group: :grp, group_minimum_answered: 2
+          END
+
+          answer = build_answer(questionnaire: questionnaire, value: {v_1: nil, v_2: nil, v_3: 'bla'})
+          validator(questionnaire: questionnaire, answer: answer).validate
+          expect(answer.errors[:v_1]).to include(message: "Needs at least 2 question(s) answered.", valtype: :answer_group_minimum)
+          expect(answer.errors[:v_2]).to include(message: "Needs at least 2 question(s) answered.", valtype: :answer_group_minimum)
+          expect(answer.errors[:v_3]).to include(message: "Needs at least 2 question(s) answered.", valtype: :answer_group_minimum)
+
+          answer = build_answer(questionnaire: questionnaire, value: {v_1: nil, v_2: nil, v_3: 'bla'})
+          allow(answer).to receive(:aborted).and_return(true)
+          validator(questionnaire: questionnaire, answer: answer).validate
           expect(answer.errors).to be_empty
         end
       end