quby 5.6.2 → 5.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd99dcef2d162e1a141450f6145039a13625b0ed353d4babb468d849ef14110b
-  data.tar.gz: 6fdd62f95d60b1bd4b983af887a3afc83dc4e38e49f69f44118f3225de4c462e
+  metadata.gz: 5158773d14f2ffb5938eb27c8227527c11246ce12c2c0d3377d24e8c44b82eb2
+  data.tar.gz: 60f29f152cd868a0a3ed47111cb04b0ca47e9f99611770f90527a32f40e5addc
 SHA512:
-  metadata.gz: b5fd4c4555693ab32bdd68d317bcd095463ef5dec25d4aae786e7626355e29049601c187ff858708e62d5c0a71e9aef4af1601a59790ce50ad0392b9879ba4a4
-  data.tar.gz: bbda27366c564a1780c4e94bad7cda6eb698cda3a653e7120b9f0e8a2a1ec240d04c090d03d3254bfe1c998d2451bab76b89ad8a8c46c11d82beae5412da1bd7
+  metadata.gz: 24183a5faec729d91f16cdc151d0c45685d794f148dc494e77d03ed94d77aa1483afc1c3f9999a700a42b0054d5b0f782f0a9d41b12c2b722011c1568990c413
+  data.tar.gz: 149a96a512180a5d5214fec08911c0a2454fd302d6c38aedf9ac1db9dc0f65f399d96f5d00ef59efe7cfb3120cbd16b221237e3a2470273fecfac51af62fc047

data/config/locales/de.yml

@@ -43,6 +43,7 @@ de:
       other: "Sie müssen mindestens %{minimum_checked_value} Möglichkeiten auswählen."
     answer_group_minimum: "Beantworten Sie mindestens %{value} von diesen Fragen"
     answer_group_maximum: "Beantworten Sie höchstens %{value} von diesen Fragen"
+    valid_option: "Nonexistent option chosen."
   video_not_supported: Ihr Browser unterstützt die Wiedergabe dieses Videos nicht. Bitte versuchen Sie es mit einem anderen Browser.
   DD: TT
   MM: MM

data/config/locales/en.yml

@@ -42,6 +42,7 @@ en:
       other: "Choose at least %{minimum_checked_value} options."
     answer_group_minimum: "Answer at least %{value} of these questions"
     answer_group_maximum: "Answer up to %{value} of these questions"
+    valid_option: "Nonexistent option chosen."
   video_not_supported: Your browser does not support playing this video. Try using a different browser.
   DD: DD
   MM: MM

data/config/locales/fr.yml

@@ -43,6 +43,7 @@ fr:
       other: "Choose at least %{minimum_checked_value} options."
     answer_group_minimum: "Answer at least %{value} of these questions"
     answer_group_maximum: "Answer up to %{value} of these questions"
+    valid_option: "Nonexistent option chosen."
   video_not_supported: Your browser does not support playing this video. Try using a different browser.
   DD: DD
   MM: MM

data/config/locales/nl.yml

@@ -42,6 +42,7 @@ nl:
       other: "U moet minstens %{minimum_checked_value} opties kiezen."
     answer_group_minimum: "Beantwoord minstens %{value} van deze vragen"
     answer_group_maximum: "Beantwoord hoogstens %{value} van deze vragen"
+    valid_option: "Niet bestaande optie gekozen."
   video_not_supported: Helaas kan je browser dit filmpje niet afspelen. Probeer een andere browser te gebruiken.
   DD: DD
   MM: MM

data/config/locales/sr.yml

@@ -54,6 +54,7 @@ sr:
       other: "Choose at least %{minimum_checked_value} options."
     answer_group_minimum: "Answer at least %{value} of these questions"
     answer_group_maximum: "Answer up to %{value} of these questions"
+    valid_option: "Nonexistent option chosen."
   video_not_supported: Your browser does not support playing this video. Try using a different browser.
   DD: DD
   MM: MM

data/lib/quby/answers/entities/subscore.rb

@@ -13,8 +13,6 @@ module Quby
         # The shortened key that will used as the field/column name for csv and oru exports,
         # excluding the questionnaire key part
         delegate :export_key, to: :subschema
-        # Whether this score will only be exported through oru/api/data exports, but not shown in interfaces
-        delegate :only_for_export, to: :subschema
 
         def initialize(subschema:, score_hash:)
           self.subschema = subschema

data/lib/quby/answers/services/answer_validations.rb

@@ -73,12 +73,6 @@ module Quby
           false
         end
 
-        def skip_validation?(answer, question)
-          return true if parent_option_is_not_selected(question)
-          return true if hidden_questions&.include?(question.key)
-          false
-        end
-
         def validate_answers
           AnswerValidator.new(questionnaire, self).validate
         end

data/lib/quby/answers/services/answer_validator.rb

@@ -24,12 +24,13 @@ module Quby
             next unless question
             next if question.hidden?
 
-            if question.depends_on.present?
-              next unless question.depends_on.any? { |key| depends_on_key_answered(key) }
-            end
-
             value = answer.send(question.key)
-            next if answer.skip_validation?(value, question)
+            next if value.blank? && %i[date check_box].exclude?(question.type) # we only validate presence on the client
+
+            case question.type
+            when :select, :radio, :scale
+              validate_single_select_value(question, value)
+            end
 
             question.validations.each do |validation|
               begin
@@ -46,13 +47,6 @@ module Quby
                   validate_date(question, validation, value)
                 when :regexp
                   validate_regexp(question, validation, value)
-                when :requires_answer
-                  if question.type == :date
-                    value = question.answer_keys.each_with_object({}) do |key, hash|
-                      hash[key] = answer.send(key)
-                    end
-                  end
-                  validate_required(question, validation, value)
                 when :minimum
                   validate_minimum(question, validation, value)
                 when :maximum
@@ -63,10 +57,6 @@ module Quby
                   validate_not_all_checked(question, validation, value)
                 when :maximum_checked_allowed
                   validate_maximum_checked_allowed(question, validation, value)
-                when :minimum_checked_required
-                  validate_minimum_checked_required(question, validation, value)
-                when :answer_group_minimum
-                  validate_answer_group_minimum(question, validation, value)
                 when :answer_group_maximum
                   validate_answer_group_maximum(question, validation, value)
                 end
@@ -78,20 +68,10 @@ module Quby
         end
         # rubocop:enable CyclomaticComplexity, Metrics/MethodLength
 
-        def validate_required(question, validation, value)
-          return unless validate_required?
-          valid = case question.type
-                  when :date
-                    required_keys = question.required_components.map do |key|
-                      question.send(key.to_s + "_key")
-                    end
-                    value.values_at(*required_keys).all?(&:present?)
-                  when :check_box
-                    value.values.reduce(:+) > 0
-                  else
-                    value.present?
-                  end
-          answer.send(:add_error, question, validation[:type], validation[:message] || "Must be answered.") unless valid
+        def validate_single_select_value(question, value)
+          return if value.blank?
+          return if question.options.any? { |option| option.key.to_s == value.to_s }
+          answer.send(:add_error, question, :valid_option, "Invalid option")
         end
 
         def validate_integer(question, validation, value)
@@ -146,7 +126,7 @@ module Quby
           # built to take into account values outside the intended range. (e.g.
           # BMI calculation)
 
-          return if value.blank? || (question.type == :date && value.values.all?(&:empty?))
+          return if value.blank? || (question.type == :date && value.values.all?(&:blank?))
           converted_answer_value = convert_answer_value(question, value)
           if converted_answer_value < validation[:value]
             answer.send(:add_error, question, validation[:type], validation[:message] || "Smaller than minimum")
@@ -204,24 +184,6 @@ module Quby
           end
         end
 
-        def validate_minimum_checked_required(question, validation, value)
-          return unless validate_required?
-
-          if value.values.reduce(:+) < question.minimum_checked_required.to_i
-            answer.send(:add_error, question, :minimum_checked_required, validation[:message] || "Not enough options checked.")
-          end
-        end
-
-        def validate_answer_group_minimum(question, validation, value)
-          return unless validate_required?
-
-          answered = answer.send(:calc_answered, answer.question_groups[validation[:group]])
-          if answered < validation[:value]
-            answer.send(:add_error, question, :answer_group_minimum,
-                        validation[:message] || "Needs at least #{validation[:value]} question(s) answered.")
-          end
-        end
-
         def validate_answer_group_maximum(question, validation, value)
           # We have decided not to allow bypassing this validation when
           # aborted, since it's possible to make a decision about which fields

data/lib/quby/answers/services/build_answer.rb

@@ -48,16 +48,15 @@ module Quby
         end
 
         def calculate_flags
-          flags = given_attributes.fetch(:flags, {})
-          questionnaire.filter_flags(flags)
+          given = questionnaire.filter_flags(given_attributes.fetch(:flags, {}))
+          defaults = questionnaire.default_flags
+          defaults.merge(given)
         end
 
         def calculate_textvars
-          given    = questionnaire.filter_textvars(given_attributes.fetch(:textvars, {}))
+          given = questionnaire.filter_textvars(given_attributes.fetch(:textvars, {}))
           defaults = questionnaire.default_textvars
-          textvars = defaults.merge(given)
-
-          textvars
+          defaults.merge(given)
         end
       end
     end

data/lib/quby/questionnaires/deserializer.rb

@@ -345,7 +345,7 @@ module Quby
           shows_questions: attrs.fetch("shows_questions").map(&:to_sym),
           hides_questions: attrs.fetch("hides_questions").map(&:to_sym),
           depends_on: attrs.fetch("depends_on"),                              # TODO: emperically determined to be a string in DSL, is that right?
-          default_in_interface: attrs.fetch("default_in_interface"),
+          default: attrs.fetch("default") { attrs.fetch("default_in_interface") }
         )
       end
 
@@ -421,7 +421,6 @@ module Quby
               key: subschema.fetch("key").to_sym,
               label: subschema.fetch("label"),
               export_key: subschema.fetch("export_key").to_sym,
-              only_for_export: subschema.fetch("only_for_export")
             }
           end
         )

data/lib/quby/questionnaires/entities/flag.rb

@@ -4,7 +4,7 @@ module Quby
   module Questionnaires
     module Entities
       class Flag < Struct.new(:key, :description_true, :description_false, :description, :internal, :trigger_on,
-                              :shows_questions, :hides_questions, :depends_on, :default_in_interface)
+                              :shows_questions, :hides_questions, :depends_on, :default)
         # rubocop:disable ParameterLists
         def initialize(key:,
                        description_true: nil,
@@ -15,25 +15,15 @@ module Quby
                        shows_questions: [],
                        hides_questions: [],
                        depends_on: nil, # used in interface to hide this flag unless the depended on flag is set to true
-                       default_in_interface: nil) # used in interface to set a default for the flag state,
-                                                  # does not have an effect outside of the interface
+                       default: nil) # default value to set upon record creation. not applied dynamically later on if missing in the flags hash for older records. In those cases, the value for that flag is simply nil, and it doesn't trigger anything because trigger_on nil is not supported.
           super(key, description_true, description_false, description, internal, trigger_on, shows_questions,
-                hides_questions, depends_on, default_in_interface)
-          ensure_valid_descriptions
+                hides_questions, depends_on, default)
         end
         # rubocop:enable ParameterLists
 
         def if_triggered_by(answer_flags)
           yield if answer_flags[key] == trigger_on
         end
-
-        private
-
-        def ensure_valid_descriptions
-          unless (description_false.present? && description_true.present?) || description.present?
-            raise "Flag '#{key}' Requires at least either both description_true and description_false or a description"
-          end
-        end
       end
     end
   end

data/lib/quby/questionnaires/entities/questionnaire.rb

@@ -228,29 +228,14 @@ module Quby
           charts.add chart
         end
 
-        def add_flag(flag_options)
-          if flag_options[:internal]
-            flag_key = flag_options[:key].to_sym
-          else
-            flag_key = "#{key}_#{flag_options[:key]}".to_sym
-          end
-          flag_options[:key] = flag_key
-          fail(ArgumentError, "Flag '#{flag_key}' already defined") if flags.key?(flag_key)
-          flags[flag_key] = Flag.new(**flag_options)
-        end
-
         def filter_flags(given_flags)
           given_flags.select do |flag_key, _|
             flags.key? flag_key
           end
         end
 
-        def add_textvar(textvar_options)
-          textvar_key = "#{key}_#{textvar_options.fetch(:key)}".to_sym
-          textvar_options[:key] = textvar_key
-          validate_textvar_keys_unique(textvar_key)
-          validate_depends_on_flag(textvar_key, textvar_options)
-          textvars[textvar_key] = Textvar.new(textvar_options)
+        def default_flags
+          flags.to_h { |key, flag| [key, flag.default] }.reject { |key, value| value.nil? }
         end
 
         def filter_textvars(given_textvars)

data/lib/quby/questionnaires/entities/subscore_schema.rb

@@ -13,8 +13,6 @@ module Quby
         # The shortened key that will used as the field/column name for csv and oru exports,
         # excluding the questionnaire key part
         attr_accessor :export_key
-        # Whether this score will only be exported through oru/api/data exports, but not shown in interfaces
-        attr_accessor :only_for_export
 
         validates :key, :label, :export_key, presence: true
         validate :key_is_symbol

data/lib/quby/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Quby
-  VERSION = "5.6.2"
+  VERSION = "5.6.4"
 end

data/spec/controllers/quby/answers_controller_spec.rb

@@ -46,10 +46,10 @@ module Quby
         end
       end
 
-      context 'with missing required answers' do
+      context 'with invalid answers' do
         it 'renders the questionnaire again' do
           allow_server_side_validation_error(always: true)
-          put :pdf, questionnaire_id: questionnaire.key, id: answer.id, answer: {}
+          put :pdf, questionnaire_id: questionnaire.key, id: answer.id, answer: {'v_1' => 'invalid_option'}
           expect(response.header['Content-Type']).to eq('text/html; charset=utf-8')
         end
       end

data/spec/features/completing_questionnaires_spec.rb

@@ -71,13 +71,14 @@ feature 'Completing a questionnaire' do
     page.driver.execute_script "window.skipValidations = true;"
 
     expect(page).to have_selector('#panel0.current')
+    fill_in 'answer[v1]', with: 'not_a_number'
     click_on "nextButton0"
     expect(page).to have_selector('#panel1.current')
     allow_server_side_validation_error(always: true)
     click_on "Klaar"
 
     # the validation error is displayed on the page
-    expect(page).to have_selector('.error.requires_answer')
+    expect(page).to have_selector('.error.valid_float')
 
     page.driver.execute_script "window.skipValidations = false;"
 

data/spec/features/question_dependencies/group_minimum_answered_spec.rb

@@ -399,8 +399,3 @@ feature 'Client-side validations for group minimum answered', js: true do
   include ClientSideValidationHelpers
   it_behaves_like "group_minimum_answered"
 end
-
-feature 'Server-side validations for group minimum answered' do
-  include ServerSideValidationHelpers
-  it_behaves_like "group_minimum_answered"
-end

data/spec/features/question_dependencies/group_minmax_answered_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-shared_examples 'group_minmax_answered_tests' do
+shared_examples 'group_minmax_answered_tests' do |on_server: false|
   it 'is valid when radio question is not filled in' do
     # select_radio_option 'v_radio', 'a1'
     select_radio_option 'v_scale', 'a1'
@@ -34,6 +34,7 @@ shared_examples 'group_minmax_answered_tests' do
   end
 
   it 'is not valid when no questions are filled' do
+    next if on_server
     # select_radio_option 'v_radio', 'a1'
     # select_radio_option 'v_scale', 'a1'
     # set_slider_value 'v_slider', '50'
@@ -43,6 +44,7 @@ shared_examples 'group_minmax_answered_tests' do
   end
 
   it 'is not valid when only one question is filled' do
+    next if on_server
     select_radio_option 'v_radio', 'a1'
     # select_radio_option 'v_scale', 'a1'
     # set_slider_value 'v_slider', '50'
@@ -61,7 +63,7 @@ shared_examples 'group_minmax_answered_tests' do
   end
 end
 
-shared_examples 'group_minmax_answered' do
+shared_examples 'group_minmax_answered' do |on_server: false|
   before do
     allow_server_side_validation_error
   end
@@ -95,7 +97,7 @@ shared_examples 'group_minmax_answered' do
       END
     end
 
-    it_behaves_like 'group_minmax_answered_tests'
+    it_behaves_like 'group_minmax_answered_tests', on_server: on_server
   end
 
   context 'table-based' do
@@ -131,7 +133,7 @@ shared_examples 'group_minmax_answered' do
       END
     end
 
-    it_behaves_like 'group_minmax_answered_tests'
+    it_behaves_like 'group_minmax_answered_tests', on_server: on_server
   end
 end
 
@@ -142,5 +144,5 @@ end
 
 feature 'Server-side validations for group minimum and maximum answered' do
   include ServerSideValidationHelpers
-  it_behaves_like "group_minmax_answered"
+  it_behaves_like "group_minmax_answered", on_server: true
 end

data/spec/features/question_validations/check_box_question_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-shared_examples 'validations on checkbox questions' do
+shared_examples 'validations on checkbox questions' do |on_server: false|
   before do
     allow_server_side_validation_error
   end
@@ -34,6 +34,7 @@ shared_examples 'validations on checkbox questions' do
     end
 
     scenario 'saving without a choice' do
+      next if on_server
       run_validations
       expect_error_on 'v_check_box', 'requires_answer'
     end
@@ -147,37 +148,6 @@ shared_examples 'validations on checkbox questions' do
     end
   end
 
-  context 'minimum_checked_required' do
-    let(:questionnaire) do
-      inject_questionnaire 'test', <<-END
-        question :v_check_box, type: :check_box, minimum_checked_required: 2 do
-          title "Pick max two"
-          option :v_ck_a1, value: 1, description: 'Unicorns'
-          option :v_ck_a2, value: 2, description: 'Rainbows'
-          option :v_ck_a3, value: 3, description: 'Wortels'
-        end
-      END
-    end
-
-    scenario 'is invalid when 1 is checked' do
-      next if validation_run_location == :client_side
-      check_option 'v_ck_a1'
-      uncheck_option 'v_ck_a2'
-      uncheck_option 'v_ck_a3'
-      run_validations
-      expect_error_on 'v_check_box', 'minimum_checked_required'
-    end
-
-    scenario 'is valid when 2 options are checked' do
-      next if validation_run_location == :client_side
-      check_option 'v_ck_a1'
-      check_option 'v_ck_a2'
-      uncheck_option 'v_ck_a3'
-      run_validations
-      expect_no_errors
-    end
-  end
-
   context 'question groups' do
     let(:questionnaire) do
       inject_questionnaire "test", <<-END
@@ -230,7 +200,7 @@ end; end; end_panel
       check_option "v_check_answer_group_over_maximum1_a2"
 
       run_validations
-      expect_error_on "v_check_answer_group_under_minimum", "answer_group_minimum"
+      expect_error_on "v_check_answer_group_under_minimum", "answer_group_minimum" unless on_server
       expect_no_error_on "v_check_answer_group_over_minimum"
       expect_no_error_on "v_check_answer_group_under_maximum"
       expect_error_on "v_check_answer_group_over_maximum", "answer_group_maximum"
@@ -245,5 +215,5 @@ end
 
 feature 'Server-side validations on checkbox questions' do
   include ServerSideValidationHelpers
-  it_behaves_like "validations on checkbox questions"
+  it_behaves_like "validations on checkbox questions", on_server: true
 end

data/spec/features/question_validations/date_question_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-shared_examples 'validations on date questions' do
+shared_examples 'validations on date questions' do |on_server: false|
   before do
     allow_server_side_validation_error
   end
@@ -30,7 +30,7 @@ shared_examples 'validations on date questions' do
       fill_in_question('v_date_month', '')
       fill_in_question('v_date_day',   '')
       run_validations
-      expect_error_on 'v_date', 'requires_answer'
+      expect_error_on 'v_date', 'requires_answer' unless on_server
     end
 
     scenario 'saving an invalid date' do
@@ -143,7 +143,7 @@ shared_examples 'validations on date questions' do
 
       scenario 'saving an empty date' do
         run_validations
-        expect_error_on 'v_date', 'requires_answer'
+        expect_error_on 'v_date', 'requires_answer' unless on_server
       end
 
       scenario 'saving with missing year' do
@@ -299,5 +299,5 @@ end
 
 feature 'Server-side validations on date questions' do
   include ServerSideValidationHelpers
-  it_behaves_like 'validations on date questions'
+  it_behaves_like 'validations on date questions', on_server: true
 end

data/spec/features/question_validations/float_question_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-shared_examples "validations on float questions" do
+shared_examples "validations on float questions" do | on_server: false|
   before do
     allow_server_side_validation_error
   end
@@ -39,7 +39,7 @@ shared_examples "validations on float questions" do
 
       fill_in_question 'v_float', ''
       run_validations
-      expect_error_on 'v_float', 'requires_answer'
+      expect_error_on 'v_float', 'requires_answer' unless on_server
     end
   end
 
@@ -92,5 +92,5 @@ end
 
 feature 'Server-side validations on float questions' do
   include ServerSideValidationHelpers
-  it_behaves_like "validations on float questions"
+  it_behaves_like "validations on float questions", on_server: true
 end

data/spec/features/question_validations/integer_question_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-shared_examples "validations on integer questions" do
+shared_examples "validations on integer questions" do |on_server: false|
   before do
     allow_server_side_validation_error
   end
@@ -39,7 +39,7 @@ shared_examples "validations on integer questions" do
 
       fill_in_question 'v_integer', ''
       run_validations
-      expect_error_on 'v_integer', 'requires_answer'
+      expect_error_on 'v_integer', 'requires_answer' unless on_server
     end
   end
 
@@ -92,5 +92,5 @@ end
 
 feature 'Server-side validations on integer questions' do
   include ServerSideValidationHelpers
-  it_behaves_like "validations on integer questions"
+  it_behaves_like "validations on integer questions", on_server: true
 end

data/spec/features/question_validations/radio_question_spec.rb

@@ -78,7 +78,4 @@ feature 'Client-side validations on radio questions', js: true do
   it_behaves_like "validations on radio questions"
 end
 
-feature 'Server-side validations on radio questions' do
-  include ServerSideValidationHelpers
-  it_behaves_like 'validations on radio questions'
-end
+# Server side this is exactly the same as select, so we don't test here.

data/spec/features/question_validations/scale_question_spec.rb

@@ -46,7 +46,4 @@ feature 'Client-side validations on scale questions', js: true do
   it_behaves_like "validations on scale questions"
 end
 
-feature 'Server-side validations on scale questions' do
-  include ServerSideValidationHelpers
-  it_behaves_like "validations on scale questions"
-end
+# Server side this is exactly the same as select, so we don't test here.

data/spec/features/question_validations/select_question_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-shared_examples 'validations on select questions' do
+shared_examples 'validations on select questions' do |on_server: false|
   before do
     allow_server_side_validation_error
   end
@@ -28,19 +28,19 @@ shared_examples 'validations on select questions' do
     scenario 'saving with an unknown select chosen' do
       next if validation_run_location == :client_side
 
-      # TODO: Is this the behaviour we really want?
       select_select_option 'v_select', 'aXX'
       run_validations
-      expect_no_errors
-      expect_saved_value 'v_select', 'aXX'
+      expect_error_on 'v_select', 'valid_option'
     end
 
     scenario 'saving without a choice' do
+      next if on_server
       run_validations
       expect_error_on 'v_select', 'requires_answer'
     end
 
     scenario 'saving selecting the placeholder' do
+      next if on_server
       select_select_option 'v_select', 'a0'
       run_validations
       expect_error_on 'v_select', 'requires_answer'
@@ -76,20 +76,22 @@ panel do
     option :a1, value: 1, description: 'Unicorns'
     option :a2, value: 2, description: 'Rainbows'
   end
-  question :v_string, type: :string, required: true, depends_on: [:v_select]
+  question :v_integer, type: :integer, required: true, depends_on: [:v_select]
 end; end_panel
       END
     end
 
     scenario 'validation triggered by depends on select' do
+      fill_in_question 'v_integer', 'not_a_number'
       select_select_option 'v_select', 'a1'
       run_validations
-      expect_error_on 'v_string', 'requires_answer'
+      expect_error_on 'v_integer', 'valid_integer'
     end
 
     scenario 'validation not triggered by depends on select' do
+      next if on_server # not send to server, otherwise should error.
       run_validations
-      expect_no_error_on 'v_string'
+      expect_no_error_on 'v_integer'
       expect_error_on 'v_select', 'requires_answer'
     end
   end
@@ -102,5 +104,5 @@ end
 
 feature 'Server-side validations on select questions' do
   include ServerSideValidationHelpers
-  it_behaves_like "validations on select questions"
+  it_behaves_like "validations on select questions", on_server: true
 end