helena 1.1.0 → 1.3.0

data/gemfiles/rails_5.1.gemfile.lock

@@ -0,0 +1,305 @@
+GIT
+  remote: https://github.com/mongoid-rspec/mongoid-rspec.git
+  revision: f392d24abc6853895bd959b4916cd82a1b12f6f4
+  specs:
+    mongoid-rspec (4.0.0.pre.alpha1)
+      activesupport (>= 4.0.0)
+      mongoid (~> 6.0)
+      rspec (~> 3.3)
+
+PATH
+  remote: ..
+  specs:
+    helena (1.3.0)
+      bootstrap-sass (~> 3.2)
+      browser (~> 2.0)
+      haml-rails (~> 1.0)
+      jquery-rails (~> 4.0)
+      mongoid (>= 4.0)
+      mongoid-simple-tags (~> 0.1)
+      mongoid-tree (~> 2.0)
+      mongoid_orderable (~> 4.1)
+      rails (>= 4.2)
+      rails-i18n (>= 4.0)
+      responders (~> 2.0)
+      sass-rails (~> 5.0)
+      simple_form (~> 3.2)
+      slim (~> 3.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (5.1.0)
+      actionpack (= 5.1.0)
+      nio4r (~> 2.0)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.1.0)
+      actionpack (= 5.1.0)
+      actionview (= 5.1.0)
+      activejob (= 5.1.0)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.1.0)
+      actionview (= 5.1.0)
+      activesupport (= 5.1.0)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.1.0)
+      activesupport (= 5.1.0)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.1.0)
+      activesupport (= 5.1.0)
+      globalid (>= 0.3.6)
+    activemodel (5.1.0)
+      activesupport (= 5.1.0)
+    activerecord (5.1.0)
+      activemodel (= 5.1.0)
+      activesupport (= 5.1.0)
+      arel (~> 8.0)
+    activesupport (5.1.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (8.0.0)
+    autoprefixer-rails (7.1.6)
+      execjs
+    better_errors (2.4.0)
+      coderay (>= 1.0.0)
+      erubi (>= 1.0.0)
+      rack (>= 0.9.0)
+    binding_of_caller (0.7.3)
+      debug_inspector (>= 0.0.1)
+    bootstrap-sass (3.3.7)
+      autoprefixer-rails (>= 5.2.1)
+      sass (>= 3.3.4)
+    browser (2.5.2)
+    bson (4.2.2)
+    builder (3.2.3)
+    byebug (9.1.0)
+    capybara (2.15.4)
+      addressable
+      mini_mime (>= 0.1.3)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      xpath (~> 2.0)
+    childprocess (0.8.0)
+      ffi (~> 1.0, >= 1.0.11)
+    coderay (1.1.2)
+    concurrent-ruby (1.0.5)
+    crass (1.0.2)
+    debug_inspector (0.0.3)
+    diff-lcs (1.3)
+    erubi (1.7.0)
+    erubis (2.7.0)
+    execjs (2.7.0)
+    factory_bot (4.8.2)
+      activesupport (>= 3.0.0)
+    factory_bot_rails (4.8.2)
+      factory_bot (~> 4.8.2)
+      railties (>= 3.0.0)
+    faker (1.8.4)
+      i18n (~> 0.5)
+    ffi (1.9.18)
+    globalid (0.4.1)
+      activesupport (>= 4.2.0)
+    haml (5.0.4)
+      temple (>= 0.8.0)
+      tilt
+    haml-rails (1.0.0)
+      actionpack (>= 4.0.1)
+      activesupport (>= 4.0.1)
+      haml (>= 4.0.6, < 6.0)
+      html2haml (>= 1.0.1)
+      railties (>= 4.0.1)
+    html2haml (2.2.0)
+      erubis (~> 2.7.0)
+      haml (>= 4.0, < 6)
+      nokogiri (>= 1.6.0)
+      ruby_parser (~> 3.5)
+    i18n (0.9.1)
+      concurrent-ruby (~> 1.0)
+    jquery-rails (4.3.1)
+      rails-dom-testing (>= 1, < 3)
+      railties (>= 4.2.0)
+      thor (>= 0.14, < 2.0)
+    json (1.8.6)
+    launchy (2.4.3)
+      addressable (~> 2.3)
+    loofah (2.1.1)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
+    method_source (0.9.0)
+    mini_mime (0.1.4)
+    mini_portile2 (2.3.0)
+    minitest (5.10.3)
+    mongo (2.4.3)
+      bson (>= 4.2.1, < 5.0.0)
+    mongoid (6.2.1)
+      activemodel (~> 5.1)
+      mongo (>= 2.4.1, < 3.0.0)
+    mongoid-simple-tags (0.1.3)
+      json (~> 1.8)
+      mongoid (>= 3.0.3)
+    mongoid-tree (2.1.0)
+      mongoid (>= 4.0, < 7.0)
+    mongoid_orderable (4.1.1)
+      mongoid
+    nio4r (2.1.0)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
+    pry (0.11.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.5.0)
+      byebug (~> 9.1)
+      pry (~> 0.10)
+    public_suffix (3.0.0)
+    rack (2.0.3)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (5.1.0)
+      actioncable (= 5.1.0)
+      actionmailer (= 5.1.0)
+      actionpack (= 5.1.0)
+      actionview (= 5.1.0)
+      activejob (= 5.1.0)
+      activemodel (= 5.1.0)
+      activerecord (= 5.1.0)
+      activesupport (= 5.1.0)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 5.1.0)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    rails-i18n (5.0.4)
+      i18n (~> 0.7)
+      railties (~> 5.0)
+    railties (5.1.0)
+      actionpack (= 5.1.0)
+      activesupport (= 5.1.0)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (12.2.1)
+    rb-fsevent (0.10.2)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    responders (2.4.0)
+      actionpack (>= 4.2.0, < 5.3)
+      railties (>= 4.2.0, < 5.3)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-collection_matchers (1.1.3)
+      rspec-expectations (>= 2.99.0.beta1)
+    rspec-core (3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-rails (3.7.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.0)
+    ruby-progressbar (1.9.0)
+    ruby_parser (3.10.1)
+      sexp_processor (~> 4.9)
+    rubyzip (1.2.1)
+    sass (3.5.3)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    sass-rails (5.0.6)
+      railties (>= 4.0.0, < 6)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (>= 1.1, < 3)
+    selenium-webdriver (3.7.0)
+      childprocess (~> 0.5)
+      rubyzip (~> 1.0)
+    sexp_processor (4.10.0)
+    shoulda-matchers (3.1.2)
+      activesupport (>= 4.0.0)
+    simple_form (3.5.0)
+      actionpack (> 4, < 5.2)
+      activemodel (> 4, < 5.2)
+    slim (3.0.8)
+      temple (>= 0.7.6, < 0.9)
+      tilt (>= 1.3.3, < 2.1)
+    sprockets (3.7.1)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    temple (0.8.0)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    tilt (2.0.8)
+    tzinfo (1.2.4)
+      thread_safe (~> 0.1)
+    websocket-driver (0.6.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
+    xpath (2.1.0)
+      nokogiri (~> 1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  better_errors
+  binding_of_caller
+  bootstrap-sass
+  capybara (~> 2.3)
+  factory_bot_rails
+  faker (~> 1.4)
+  helena!
+  jquery-rails
+  launchy
+  mongoid (>= 6.0)
+  mongoid-rspec!
+  pry
+  pry-byebug
+  rails (= 5.1)
+  rake
+  rspec-collection_matchers (~> 1)
+  rspec-rails (~> 3)
+  ruby-progressbar
+  selenium-webdriver
+  shoulda-matchers
+  simple_form
+
+BUNDLED WITH
+   1.16.0.pre.3

data/helena.gemspec

@@ -19,25 +19,25 @@ survey/test development, longitudinal studies and instant feedback.'
   s.files        = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {spec}/*`.split("\n")
 
-  s.add_dependency 'rails', '~> 4.2'
-  s.add_dependency 'mongoid', ['< 6.0', '>= 4.0']
+  s.add_dependency 'rails', '>= 4.2'
+  s.add_dependency 'mongoid', '>= 4.0'
   s.add_dependency 'mongoid_orderable', '~> 4.1'
-  s.add_dependency 'mongoid-simple-tags', '~> 0.1'
-  s.add_dependency 'haml-rails', '~> 0.9'
+  s.add_dependency 'mongoid-simple-tags', '>= 0.1.3'
+  s.add_dependency 'haml-rails', '~> 1.0'
   s.add_dependency 'slim', '~> 3.0'
   s.add_dependency 'jquery-rails', '~> 4.0'
   s.add_dependency 'sass-rails', '~> 5.0'
   s.add_dependency 'bootstrap-sass', '~> 3.2'
   s.add_dependency 'simple_form', '~> 3.2'
-  s.add_dependency 'breadcrumbs_on_rails', '~> 2.3'
-  s.add_dependency 'rails-i18n', '~> 4.0'
+  s.add_dependency 'rails-i18n', '>= 4.0'
   s.add_dependency 'responders', '~> 2.0'
   s.add_dependency 'browser', '~> 2.0'
   s.add_dependency 'mongoid-tree', '~> 2.0'
 
   s.add_development_dependency 'rspec-rails', '~> 3'
   s.add_development_dependency 'rspec-collection_matchers', '~> 1'
-  s.add_development_dependency 'factory_girl_rails', '~> 4.4'
+  s.add_development_dependency 'factory_bot_rails'
   s.add_development_dependency 'faker', '~> 1.4'
   s.add_development_dependency 'capybara', '~> 2.3'
+  s.add_development_dependency "appraisal"
 end

data/lib/helena/engine.rb

@@ -4,8 +4,8 @@ module Helena
     config.i18n.load_path += Dir[config.root.join('config', 'locales', '**', '*.{rb,yml}').to_s]
 
     # Thanks to https://github.com/thoughtbot/factory_girl_rails/pull/42
-    initializer 'helena.factories', after: 'factory_girl.set_factory_paths' do
-      FactoryGirl.definition_file_paths << File.expand_path('../../../spec/factories', __FILE__) if defined?(FactoryGirl)
+    initializer 'helena.factories', after: 'factory_bot.set_factory_paths' do
+      FactoryBot.definition_file_paths << File.expand_path('../../../spec/factories', __FILE__) if defined?(FactoryBot)
     end
 
     config.to_prepare do

data/lib/helena/survey_importer.rb

@@ -5,7 +5,7 @@ module Helena
     attr_accessor :survey
 
     def initialize(yaml_string)
-      @parsed = YAML.load yaml_string
+      @parsed = YAML.safe_load yaml_string
 
       create_survey
     end

data/lib/helena/version.rb

@@ -1,3 +1,3 @@
 module Helena
-  VERSION = '1.1.0'
+  VERSION = '1.3.0'.freeze
 end

data/lib/helena/version_publisher.rb

@@ -17,8 +17,8 @@ module Helena
     def self.adjust_copied_attributes(version, copied_version)
       copied_version.version = newest_version_of(version.survey) + 1
       copied_version.survey_detail = version.survey_detail.attributes if version.survey_detail
-      copied_version.created_at = DateTime.now
-      copied_version.updated_at = DateTime.now
+      copied_version.created_at = Time.now
+      copied_version.updated_at = Time.now
       copied_version.active = false
       copied_version
     end

data/spec/controllers/helena/sessions_controller_spec.rb

@@ -15,19 +15,19 @@ describe Helena::SessionsController do
   context 'version not active' do
     before { version.update_attribute :active, false }
 
-    it 'raises not found when editing' do
-      get :edit, token: session.token
+    it 'raises not found when editing' do      
+      get :edit, parametrize(token: session.token) 
       is_expected.to respond_with :not_found
     end
 
     it 'raises not found when updating' do
-      patch :update, token: session.token
+      patch :update, parametrize(token: session.token)
       is_expected.to respond_with :not_found
     end
   end
 
   it 'return json result of the current session' do
-    get :show, token: session.view_token, format: :json
+    get :show, parametrize(token: session.view_token).merge(format: :json)
 
     result = ActiveSupport::JSON.decode(response.body)
     expect(result['answer']['string_answer_1']).to eq 'abc'
@@ -36,7 +36,7 @@ describe Helena::SessionsController do
 
   it 'renders session_report as slim template' do
     session.version.update_attribute :session_report, 'h1 make it slim!'
-    get :show, token: session.view_token
+    get :show, parametrize(token: session.view_token)
 
     expect(response.body).to eq '<h1>make it slim!</h1>'
   end

data/spec/dummy/app/views/layouts/application.html.haml

@@ -1,7 +1,7 @@
 !!!
 %html
   %head
-    %title= strip_tags(render_breadcrumbs separator: '/')
+    %title Helena
     = stylesheet_link_tag    'helena/application', media: 'all'
     = javascript_include_tag 'helena/application'
     %meta{ name: 'viewport', content: 'initial-scale=1.0' }
@@ -19,6 +19,4 @@
               %li= message
       %h1.hidden
         Helena
-      %ol.breadcrumb
-        = render_breadcrumbs tag: :li, separator: ''
       = yield

data/spec/dummy/bin/rails

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
+APP_PATH = File.expand_path('../../config/application', __FILE__)
 require_relative '../config/boot'
 require 'rails/commands'

data/spec/dummy/config/environments/development.rb

@@ -26,4 +26,6 @@ Dummy::Application.configure do
   # This option may cause significant delays in view rendering with a large
   # number of complex assets.
   config.assets.debug = true
+
+  config.assets.quiet = true
 end

data/spec/dummy/config/environments/test.rb

@@ -12,10 +12,6 @@ Dummy::Application.configure do
   # preloads Rails for running tests, you may have to set it to true.
   config.eager_load = false
 
-  # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_files  = true
-  config.static_cache_control = 'public, max-age=3600'
-
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false

data/spec/dummy/config.ru

@@ -1,4 +1,4 @@
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment',  __FILE__)
+require ::File.expand_path('../config/environment', __FILE__)
 run Rails.application

data/spec/factories/helena/answers.rb

@@ -1,24 +1,24 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :answer, class: Helena::Answer do
-    sequence(:code)  { |n| "answer_#{n}" }
-    sequence(:ip_address) {  Faker::Internet.ip_v4_address }
+    sequence(:code) { |n| "answer_#{n}" }
+    sequence(:ip_address) { Faker::Internet.ip_v4_address }
   end
 
   factory :string_answer, class: Helena::StringAnswer do
     sequence(:code)  { |n| "string_answer_#{n}" }
-    sequence(:value) {  Faker::Skill.tech_skill }
-    sequence(:ip_address) {  Faker::Internet.ip_v4_address }
+    sequence(:value) { Faker::Lorem.word }
+    sequence(:ip_address) { Faker::Internet.ip_v4_address }
   end
 
   factory :integer_answer, class: Helena::IntegerAnswer do
     sequence(:code)  { |n| "integer_answer_#{n}" }
     sequence(:value) { rand 99 }
-    sequence(:ip_address) {  Faker::Internet.ip_v4_address }
+    sequence(:ip_address) { Faker::Internet.ip_v4_address }
   end
 
   factory :boolean_answer, class: Helena::BooleanAnswer do
     sequence(:code)  { |n| "boolean_answer_#{n}" }
     sequence(:value) { [true, false].sample }
-    sequence(:ip_address) {  Faker::Internet.ip_v4_address }
+    sequence(:ip_address) { Faker::Internet.ip_v4_address }
   end
 end

data/spec/factories/helena/labels.rb

@@ -1,6 +1,7 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :label, class: Helena::Label do
-    sequence(:text)  { |n| "Option #{n}" }
+    sequence(:text) { |n| "Option #{n}" }
     sequence(:value)
+    question
   end
 end

data/spec/factories/helena/question_groups.rb

@@ -1,5 +1,6 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :question_group, class: Helena::QuestionGroup do
-    sequence(:title)  { |n| "Page #{n}" }
+    sequence(:title) { |n| "Page #{n}" }
+    version
   end
 end

data/spec/factories/helena/questions.rb

@@ -1,7 +1,8 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :question, class: Helena::Question do
-    sequence(:question_text)  { |n| "Question #{n}, #{Faker::Lorem.words(3).join(' ')}?" }
+    sequence(:question_text) { |n| "Question #{n}, #{Faker::Lorem.words(3).join(' ')}?" }
     sequence(:code) { |n| "x#{n}" }
+    question_group
 
     factory :short_text_question, class: Helena::Questions::ShortText
     factory :static_text_question, class: Helena::Questions::StaticText

data/spec/factories/helena/sessions.rb

@@ -1,8 +1,12 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :session, class: Helena::Session do
-    sequence(:token)  { |n| "token_#{n}" }
+    sequence(:token) { |n| "token_#{n}" }
+    survey
+    version
   end
 
   factory :session_without_token, class: Helena::Session do
+    survey
+    version
   end
 end

data/spec/factories/helena/sub_questions.rb

@@ -1,6 +1,7 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :sub_question, class: Helena::SubQuestion do
-    sequence(:text)  { |n| "Question #{n}, #{Faker::Lorem.words(3).join(' ')}?" }
+    sequence(:text) { |n| "Question #{n}, #{Faker::Lorem.words(3).join(' ')}?" }
     sequence(:code) { |n| "y#{n}" }
+    question
   end
 end

data/spec/factories/helena/survey_details.rb

@@ -1,6 +1,7 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :survey_detail, class: Helena::SurveyDetail do
-    sequence(:title)  { |n| "Survey #{n}, #{Faker::Lorem.words(3).join(' ')}?" }
-    sequence(:description) {  Faker::Lorem.paragraphs(3).join(' ') }
+    sequence(:title) { |n| "Survey #{n}, #{Faker::Lorem.words(3).join(' ')}?" }
+    sequence(:description) { Faker::Lorem.paragraphs(3).join(' ') }
+    version
   end
 end

data/spec/factories/helena/surveys.rb

@@ -1,6 +1,6 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :survey, class: Helena::Survey do
-    sequence(:name)  { |n| "Survey #{n}" }
+    sequence(:name) { |n| "Survey #{n}" }
     language 'en'
   end
 end

data/spec/factories/helena/versions.rb

@@ -1,11 +1,13 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :version, class: Helena::Version do
     sequence(:version)
     notes { Faker::Lorem.paragraphs(1).join('') }
+    survey
   end
 
   factory :base_version, class: Helena::Version do
     version { 0 }
     notes { Faker::Lorem.paragraphs(1).join('') }
+    survey
   end
 end

data/spec/features/helena/manage_session_spec.rb

@@ -10,10 +10,10 @@ feature 'Session management' do
   end
 
   scenario 'edits a session' do
-    short_text_question  = build :short_text_question, code: 'a_name', question_text: "What's your name?"
+    short_text_question = build :short_text_question, code: 'a_name', question_text: "What's your name?"
     first_question_group.questions << short_text_question
 
-    long_text_question  = build :long_text_question, code: 'selfdescription', question_text: 'Give a brief description of yourself'
+    long_text_question = build :long_text_question, code: 'selfdescription', question_text: 'Give a brief description of yourself'
     first_question_group.questions << long_text_question
 
     second_question_group = base_version.question_groups.create title: 'Question Group 2', allow_to_go_back: true
@@ -167,7 +167,7 @@ feature 'Session management' do
   end
 
   scenario 'does not save an empty short text field when required' do
-    short_text_question  = build :short_text_question, code: 'a_name', question_text: "What's your name?", required: true
+    short_text_question = build :short_text_question, code: 'a_name', question_text: "What's your name?", required: true
     first_question_group.questions << short_text_question
 
     session = survey.sessions.create version_id: base_version.id, token: 'abc'
@@ -181,7 +181,7 @@ feature 'Session management' do
   end
 
   scenario 'does not display "* indicates required fields" when no required fields are in question group' do
-    short_text_question  = build :short_text_question, code: 'a_name', question_text: "What's your name?", required: false
+    short_text_question = build :short_text_question, code: 'a_name', question_text: "What's your name?", required: false
     first_question_group.questions << short_text_question
 
     session = survey.sessions.create version_id: base_version.id, token: 'abc'
@@ -193,7 +193,7 @@ feature 'Session management' do
   end
 
   scenario 'does not save an empty long text field when required' do
-    long_text_question  = build :long_text_question, code: 'selfdescription', question_text: 'Give a brief description of yourself', required: true
+    long_text_question = build :long_text_question, code: 'selfdescription', question_text: 'Give a brief description of yourself', required: true
     first_question_group.questions << long_text_question
 
     session = survey.sessions.create version_id: base_version.id, token: 'abc'

data/spec/lib/version_publisher_spec.rb

@@ -10,7 +10,7 @@ describe Helena::VersionPublisher do
   let!(:sub_question) { create(:sub_question, text: 'ymca', code: 'cde', question: question) }
 
   it 'creates a new version' do
-    allow(DateTime).to receive(:now).and_return('Tue, 24 Jun 2014 10:24:08 +0200')
+    allow(Time).to receive(:now).and_return(Time.parse('Tue, 24 Jun 2014 10:24:08 +0200'))
 
     new_version = Helena::VersionPublisher.publish(source_version)
     new_version.save

data/spec/models/helena/answer_spec.rb

@@ -15,7 +15,7 @@ describe Helena::Answer do
   end
 
   it 'has a valid factory' do
-    expect(build :answer).to be_valid
+    expect(build(:answer)).to be_valid
   end
 
   describe '.build_generic' do

data/spec/models/helena/label_spec.rb

@@ -6,6 +6,6 @@ describe Helena::Label do
   it { expect(subject).to validate_uniqueness_of(:value) }
 
   it 'has a valid factory' do
-    expect(build :label).to be_valid
+    expect(build(:label)).to be_valid
   end
 end

data/spec/models/helena/question_group_spec.rb

@@ -7,6 +7,6 @@ describe Helena::QuestionGroup do
   it { expect(subject).to belong_to(:version) }
 
   it 'has a valid factory' do
-    expect(build :question_group).to be_valid
+    expect(build(:question_group)).to be_valid
   end
 end