quby 5.0.0 → 5.0.5

data/spec/quby/questionnaires/entities/charting/bar_chart_spec.rb

@@ -7,14 +7,8 @@ module Quby::Questionnaires::Entities
     describe BarChart do
       it_behaves_like Chart
 
-      it 'can set plotlines' do
-        chart = BarChart.new(:tot, plotlines: [{value: 40, color: :red, width: 1, zIndex: 3}])
-        expect(chart.plotlines).to eq([{value: 40, color: :red, width: 1, zIndex: 3}])
-      end
-
-      it 'can set plotbands' do
-        chart = BarChart.new(:tot, plotbands: [{from: 40, to: 60, color: :red}])
-        expect(chart.plotbands).to eq([{from: 40, to: 60, color: :red}])
+      it 'has a type' do
+        expect(BarChart.new(:tot).type).to eq 'bar_chart'
       end
     end
   end

data/spec/quby/questionnaires/entities/charting/radar_chart_spec.rb

@@ -10,11 +10,6 @@ module Quby::Questionnaires::Entities
       it 'has a type' do
         expect(RadarChart.new(:tot).type).to eq 'radar_chart'
       end
-
-      it 'can set plotlines' do
-        chart = RadarChart.new(:tot, plotlines: [{value: 40, color: :red, width: 1, zIndex: 3}])
-        expect(chart.plotlines).to eq([{value: 40, color: :red, width: 1, zIndex: 3}])
-      end
     end
   end
 end

data/spec/quby/questionnaires/entities/fields_spec.rb

@@ -102,8 +102,8 @@ module Quby::Questionnaires::Entities
             {value: 2, interpretation: 'Very high'}
           end
 
-          score_schema :tot, 'Total', [{key: :value, export_key: 'tot', label: 'Score'},
-                                       {key: :interpretation, export_key: 'tot_i', label: 'Interpretation'}]
+          score_schema :tot, 'Total', [{key: :value, export_key: :tot, label: 'Score'},
+                                       {key: :interpretation, export_key: :tot_i, label: 'Interpretation'}]
 
         end
       end

data/spec/quby/questionnaires/entities/questionnaire_spec.rb

@@ -334,13 +334,15 @@ module Quby::Questionnaires::Entities
                                                  description_true: 'Test flag',
                                                  description_false: 'Test flag uit',
                                                  shows_questions: [:v_1],
-                                                 hides_questions: []),
+                                                 hides_questions: [],
+                                                 depends_on: []),
                                             'test_test2' => Quby::Questionnaires::Entities::Flag.new(
                                                 key: :test_test2,
                                                 description_true: 'Test flag 2',
                                                 description_false: 'Test flag 2 uit',
                                                 shows_questions: [],
-                                                hides_questions: [:v_2]) })
+                                                hides_questions: [:v_2],
+                                                depends_on: []) })
       end
     end
 

data/spec/quby/questionnaires/repos/disk_repo_spec.rb

@@ -13,7 +13,9 @@ module Quby::Questionnaires::Repos
     end
 
     context 'when integrated' do
-      it_behaves_like 'a valid backend for the questionnaires api'
+      it_behaves_like 'a valid backend for the questionnaires api' do
+        let(:repo) { DiskRepo.new('./spec/fixtures') }
+      end
     end
 
     context 'in isolation' do

data/spec/quby/questionnaires/repos/memory_repo_spec.rb

@@ -6,7 +6,8 @@ require 'spec_helper'
 module Quby::Questionnaires::Repos
   describe MemoryRepo do
     it_behaves_like 'a valid backend for the questionnaires api' do
-      let(:repo) { MemoryRepo.new('simple' => File.read('./spec/fixtures/simple.rb')) }
+      let(:repo) { MemoryRepo.new('simple' => File.read('./spec/fixtures/simple.rb'),
+                                  'simple_with_outcome' => File.read('./spec/fixtures/simple_with_outcome.rb')) }
     end
 
     it_behaves_like 'a questionnaire repository' do

data/spec/spec_helper.rb

@@ -46,16 +46,27 @@ require 'quby/answers/specs'
 require 'quby/questionnaires/specs'
 
 Capybara.default_selector = :css
+if ENV['SELENIUM_HOST'].present? && ENV['TEST_APP_PORT'].present?
+  # we live in docker-compose,
+  # dependencies can't easily link back to main service by using service name as hostname,
+  # so we find our ip.
+  docker_ip = `hostname -i`.strip
+  Capybara.app_host = "http://#{docker_ip}" #:#{ENV['TEST_APP_PORT']}"
+  Capybara.server_host = '0.0.0.0'
+  Capybara.server_port = ENV['TEST_APP_PORT']
+  selenium_url = "http://#{ENV['SELENIUM_HOST']}:#{ENV['SELENIUM_PORT']}/wd/hub"
+end
+Capybara.always_include_port = true
 Capybara.register_driver :selenium_chrome_headless do |app|
   options = Selenium::WebDriver::Chrome::Options.new
   options.add_argument('--headless')
   options.add_argument('--disable-gpu')
   options.add_argument('--no-sandbox')
 
-  Capybara::Selenium::Driver.new(app,
+  Capybara::Selenium::Driver.new app,
                                  browser: :chrome,
+                                 url: selenium_url,
                                  options: options
-  )
 end
 Capybara.javascript_driver = :selenium_chrome_headless
 Capybara::Screenshot.register_driver(:selenium_chrome_headless) do |driver, path|

data/spec/support/examples_for_chart.rb

@@ -29,4 +29,14 @@ shared_examples_for Quby::Questionnaires::Entities::Charting::Chart do
   it 'defaults y_range_categories to nil' do
     expect(described_class.new('test').y_range_categories).to eq(nil)
   end
+
+  it 'can set plotlines' do
+    chart = described_class.new(:tot, plotlines: [{value: 40, color: :red}])
+    expect(chart.plotlines).to eq([{value: 40, color: :red}])
+  end
+
+  it 'can set plotbands' do
+    chart = described_class.new(:tot, plotbands: [{from: 40, to: 60, color: :red}])
+    expect(chart.plotbands).to eq([{from: 40, to: 60, color: :red}])
+  end
 end

data/spec/support/validation_helpers.rb

@@ -44,6 +44,11 @@ module ClientSideValidationHelpers
     end
   end
 
+  # sets it half-way
+  def set_slider_value(question_key, _value)
+    find("#item_#{question_key} .noUi-base", visible: false).click
+  end
+
   def run_validations
     within '#panel0.current' do
       click_on 'Verder'
@@ -117,6 +122,10 @@ module ServerSideValidationHelpers
     answer_to_submit[question_key] = option_key
   end
 
+  def set_slider_value(question_key, value)
+    answer_to_submit[question_key] = value
+  end
+
   def run_validations
     answer.errors.clear
     updates_answers.update(answer_to_submit)

data/spec/teaspoon_env.rb

@@ -18,9 +18,8 @@ unless defined? Rails
   require 'jquery-ui-rails'
   require 'combustion'
   Combustion.path = 'spec/internal'
-
   require 'quby'
-  require 'teaspoon'
+  require 'selenium-webdriver'
   require 'teaspoon-jasmine'
 
   if Rails.env.test? || Rails.env.development?
@@ -45,6 +44,37 @@ Teaspoon.configure do |config|
   # http://localhost:3000/jasmine to run your specs.
   config.mount_at = "/teaspoon"
 
+  config.driver = :selenium
+
+
+  chrome_options = Selenium::WebDriver::Chrome::Options.new(args: ['headless', 'disable-gpu'])
+  desired_capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(
+    chrome_options: chrome_options
+  )
+  options = if ENV['SELENIUM_HOST'].present?
+    docker_ip = `hostname -i`.strip
+    config.server_host = docker_ip
+    config.server_port = ENV['TEST_APP_PORT']
+    http_client = Selenium::WebDriver::Remote::Http::Default.new(read_timeout: 20)
+    {
+      client_driver: :remote,
+      selenium_options: {
+        url: "http://#{ENV['SELENIUM_HOST']}:#{ENV['SELENIUM_PORT']}/wd/hub",
+        http_client: http_client,
+        desired_capabilities: desired_capabilities
+      }
+    }
+  else
+    {
+      client_driver: :chrome,
+      selenium_options: {
+        desired_capabilities: desired_capabilities
+      }
+    }
+  end
+
+  config.driver_options = options
+
   # This defaults to Rails.root if left nil. If you're testing an engine using a dummy application it can be useful to
   # set this to your engines root.. E.g. `Teaspoon::Engine.root`
   config.root = Quby::Engine.root

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quby
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.0.5
 platform: ruby
 authors:
 - Marten Veldthuis
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-24 00:00:00.000000000 Z
+date: 2021-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -291,28 +291,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 4.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 4.2.2
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 4.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 4.2.1
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
@@ -854,6 +854,7 @@ files:
 - spec/fixtures/question_hiding.rb
 - spec/fixtures/questionnaire_with_chart.rb
 - spec/fixtures/score_test.rb
+- spec/fixtures/scores_from_schema.rb
 - spec/fixtures/simple.rb
 - spec/fixtures/simple_with_outcome.rb
 - spec/fixtures/subquestion_key_clash.rb
@@ -6600,7 +6601,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: Questionnaire engine
@@ -12333,6 +12334,7 @@ test_files:
 - spec/javascripts/spec_helper.coffee
 - spec/fixtures/question_hiding.rb
 - spec/fixtures/all_validations.rb
+- spec/fixtures/scores_from_schema.rb
 - spec/fixtures/aged_score_interpretations.rb
 - spec/fixtures/questionnaire_with_chart.rb
 - spec/fixtures/simple.rb