helena_administration 0.0.2 → 0.0.5

data/app/controllers/helena_administration/questions/{radio_matrix_controller.rb → radio_matrices_controller.rb}

@@ -1,6 +1,6 @@
 module HelenaAdministration
   module Questions
-    class RadioMatrixController < QuestionsController
+    class RadioMatricesController < QuestionsController
       include Helena::Concerns::Questions::MatrixQuestions
     end
   end

data/app/controllers/helena_administration/questions_controller.rb

@@ -18,10 +18,11 @@ module HelenaAdministration
       @question = @question_group.questions.build question_params
       if @question.save
         flash[:success] = t 'shared.actions.created'
+        respond_with @question, location: [@survey, @version, @question_group, @question]
       else
-        flash.now[:danger] = t 'shared.actions.error'
+        flash[:danger] = t 'shared.actions.error'
+        render 'new'
       end
-      respond_with [@survey, @version, @question_group, @question]
     end
 
     def edit
@@ -78,7 +79,7 @@ module HelenaAdministration
     end
 
     def question_params
-      required_param.permit(permited_params + [:question_text,  :code, :_type])
+      required_param.permit(permited_params + [:position, :question_text,  :code, :_type])
     end
 
     def permited_params

data/app/controllers/helena_administration/sessions_controller.rb

@@ -1,6 +1,9 @@
+require 'csv'
 module HelenaAdministration
   class SessionsController < ApplicationController
-    respond_to :html
+    include ActionController::Live
+
+    respond_to :html, :json, :csv
 
     before_filter :load_survey, :add_breadcrumbs
     before_filter :load_session, only: [:edit, :update, :destroy]
@@ -9,7 +12,9 @@ module HelenaAdministration
       respond_to do |format|
         @sessions = @survey.sessions.desc(:created_at)
         format.json { render json: @sessions }
-        format.csv { render text: @sessions.to_csv }
+        format.csv do
+          render_csv
+        end
       end
     end
 
@@ -40,6 +45,29 @@ module HelenaAdministration
 
     private
 
+    def render_csv
+      response.headers['Content-Disposition'] = "attachment; filename=#{@survey.name}.csv"
+      response.headers['Content-Type'] = 'text/csv'
+
+      # Write csv header once ...
+      response.stream.write CSV.generate_line(session_fields + question_codes)
+
+      # .. and generate a line for each session.
+      @sessions.each do |session|
+        response.stream.write CSV.generate_line(session_values(session) + answer_values(session, question_codes))
+      end
+    ensure
+      response.stream.close
+    end
+
+    def session_values(session)
+      session_fields.map { |field| session.attributes[field] }
+    end
+
+    def answer_values(session, answer_codes)
+      answer_codes.map  { |code|  session.answers.where(code: code).first.try(&:value) }
+    end
+
     def add_breadcrumbs
       add_breadcrumb t('shared.navigation.dashboard'), dashboard_index_path
       add_breadcrumb Helena::Survey.model_name.human(count: 2), surveys_path
@@ -56,5 +84,21 @@ module HelenaAdministration
     def session_params
       params.require(:session).permit :token, :view_token, :answers_as_yaml, :completed, :last_question_group_id
     end
+
+    def question_codes
+      @question_codes ||= unique_question_codes
+    end
+
+    # It could be possible that an answer code equals a session field. We add "answer_" in that case so that we get uniqe question codes for sure
+    def unique_question_codes
+      codes = @survey.versions.map(&:question_codes).flatten
+      codes.map do |code|
+        session_fields.include?(code) ? "answer_#{code}" : code
+      end
+    end
+
+    def session_fields
+      Helena::Session.fields.keys
+    end
   end
 end

data/app/controllers/helena_administration/versions_controller.rb

@@ -23,7 +23,7 @@ module HelenaAdministration
       else
         flash.now[:danger] = t 'shared.actions.error'
       end
-      respond_with [@survey, @version]
+      respond_with @version, location: [@survey, @version]
     end
 
     def edit
@@ -38,7 +38,7 @@ module HelenaAdministration
         flash.now[:danger] = t 'shared.actions.error'
         add_breadcrumb t 'helena_administration.versions.version', version: @version.version
       end
-      respond_with [@survey, @version], location: [:edit, @survey, @version]
+      respond_with @version, location: [:edit, @survey, @version]
     end
 
     def destroy

data/app/views/helena_administration/questions/_form.html.slim

@@ -1,4 +1,5 @@
 = simple_form_for [@survey, @version, @question_group, question] do |f|
+  = f.input :position
   = f.input :question_text
   = f.input :code, hint: t('shared.code_hint')
   = f.input :_type, collection: Helena::Question::TYPES.map { |type| [type.model_name.human, type] }

data/config/routes.rb

@@ -15,8 +15,9 @@ HelenaAdministration::Engine.routes.draw do
           resources :static_texts, module: 'questions'
           resources :radio_groups, module: 'questions'
           resources :checkbox_groups, module: 'questions'
-          resources :radio_matrix, module: 'questions'
-          resources :checkbox_matrix, module: 'questions'
+          resources :radio_matrices, module: 'questions'
+          resources :bipolar_radio_matrices, module: 'questions'
+          resources :checkbox_matrices, module: 'questions'
         end
       end
     end

data/helena_administration.gemspec

@@ -18,20 +18,23 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {spec}/*`.split("\n")
 
   s.add_runtime_dependency 'kaminari', '~> 0.16'
-  s.add_runtime_dependency 'rails', '~> 4.1'
-  s.add_runtime_dependency 'slim-rails', '~> 2.1'
-  s.add_runtime_dependency 'codemirror-rails', '~> 4.5'
+  s.add_runtime_dependency 'rails', '~> 4.2'
+  s.add_runtime_dependency 'slim-rails', '~> 3.0'
+  s.add_runtime_dependency 'codemirror-rails', '~> 5'
   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.5'
   s.add_runtime_dependency 'html5-rails', '~> 0.1'
-  s.add_dependency 'jquery-rails', '~> 3.1'
-  s.add_runtime_dependency 'sass-rails', '~> 4.0'
+  s.add_dependency 'jquery-rails', '~> 4'
+  s.add_runtime_dependency 'sass-rails', '~> 5.0'
   s.add_dependency 'bootstrap-sass', '~> 3.2'
   s.add_dependency 'simple_form', '~> 3.1.0.rc2'
   s.add_dependency 'breadcrumbs_on_rails', '~> 2.3'
   s.add_dependency 'rails-i18n', '~> 4.0'
-  s.add_runtime_dependency 'font-awesome-rails', '~> 4.2'
+  s.add_runtime_dependency 'font-awesome-sass', '~> 4.3.0'
   s.add_runtime_dependency 'coffee-rails', '~> 4.1'
+  s.add_dependency 'responders', '~> 2.0'
+  
+  s.add_development_dependency 'database_cleaner', '~> 1.3'
 end

data/lib/helena_administration/version.rb

@@ -1,3 +1,3 @@
 module HelenaAdministration
-  VERSION = '0.0.2'
+  VERSION = '0.0.5'
 end

data/lib/helena_administration.rb

@@ -2,7 +2,7 @@ require 'helena_administration/engine'
 require 'breadcrumbs_on_rails'
 require 'html5-rails'
 require 'bootstrap-sass'
-require 'font-awesome-rails'
+require 'font-awesome-sass'
 require 'codemirror-rails'
 require 'jquery-rails'
 require 'helena'

data/spec/controllers/dashboard_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'rails_helper'
+require 'spec_helper'
 
 describe HelenaAdministration::DashboardController do
   routes { HelenaAdministration::Engine.routes }

data/spec/controllers/sessions_controller_spec.rb

@@ -1,102 +1,94 @@
-require 'rails_helper'
+require 'spec_helper'
 
 describe HelenaAdministration::SessionsController do
   routes { HelenaAdministration::Engine.routes }
 
   let(:survey) { create :survey }
-
-  context 'without authorization' do
-    before { allow_any_instance_of(HelenaAdministration::ApplicationController).to receive(:can_administer?).and_return false }
-
-    specify 'trying to list surveys throws an error' do
-      expect { get :index, survey_id: survey }.to raise_error(ActionController::RoutingError, 'Access Denied')
-    end
-
-    specify 'trying to export surveys as json throws an error' do
-      expect { get :index, survey_id: survey, format: :json }.to raise_error(ActionController::RoutingError, 'Access Denied')
-    end
-
-    specify 'trying to export surveys as csv throws an error' do
-      expect { get :index, survey_id: survey, format: :csv }.to raise_error(ActionController::RoutingError, 'Access Denied')
-    end
+  let(:version) { survey.versions.create version: 0 }
+  let(:question_group) { version.question_groups.create title: 'Abakadabara' }
+
+  before do
+    question_group.questions.create code: 'string_answer_1', question_text: 'Yo!', _type: Helena::Questions::LongText
+    question_group.questions.create code: 'integer_answer_1', question_text: 'Bo', _type: Helena::Questions::ShortText
+
+    question_group.questions.create code: 'string_answer_2', question_text: 'Hip', _type: Helena::Questions::LongText
+    question_group.questions.create code: 'integer_answer_2', question_text: 'Hop', _type: Helena::Questions::ShortText
+
+    create :session, survey: survey, answers: [
+      build(:string_answer, code: 'string_answer_1', value: 'abc'),
+      build(:integer_answer, code: 'integer_answer_1', value: '123')
+    ]
+    create :session, survey: survey, answers: [
+      build(:string_answer, code: 'string_answer_2', value: 'def, xyz'),
+      build(:integer_answer, code: 'integer_answer_2', value: '456')
+    ]
   end
 
-  context 'with authorization' do
-    before do
-      create :session, survey: survey, answers: [
-        build(:string_answer, code: 'string_answer_1', value: 'abc'),
-        build(:integer_answer, code: 'integer_answer_1', value: '123')
-      ]
-      create :session, survey: survey, answers: [
-        build(:string_answer, code: 'string_answer_2', value: 'def, xyz'),
-        build(:integer_answer, code: 'integer_answer_2', value: '456')
-      ]
-    end
-
-    it 'return json result of all sessions' do
-      get :index, survey_id: survey, format: :json
+  it 'return json result of all sessions' do
+    get :index, survey_id: survey, format: :json
 
-      first_result = ActiveSupport::JSON.decode(response.body).first
+    first_result = ActiveSupport::JSON.decode(response.body).first
 
-      expect(first_result['answers'].first['code']).to eq 'string_answer_2'
-      expect(first_result['answers'].first['value']).to eq 'def, xyz'
-      expect(first_result['answers'].last['code']).to eq 'integer_answer_2'
-      expect(first_result['answers'].last['value']).to eq 456
+    expect(first_result['answers'].first['code']).to eq 'string_answer_2'
+    expect(first_result['answers'].first['value']).to eq 'def, xyz'
+    expect(first_result['answers'].last['code']).to eq 'integer_answer_2'
+    expect(first_result['answers'].last['value']).to eq 456
 
-      last_result = ActiveSupport::JSON.decode(response.body).last
+    last_result = ActiveSupport::JSON.decode(response.body).last
 
-      expect(last_result['answers'].first['code']).to eq 'string_answer_1'
-      expect(last_result['answers'].first['value']).to eq 'abc'
-      expect(last_result['answers'].last['code']).to eq 'integer_answer_1'
-      expect(last_result['answers'].last['value']).to eq 123
-    end
+    expect(last_result['answers'].first['code']).to eq 'string_answer_1'
+    expect(last_result['answers'].first['value']).to eq 'abc'
+    expect(last_result['answers'].last['code']).to eq 'integer_answer_1'
+    expect(last_result['answers'].last['value']).to eq 123
+  end
 
-    it 'return json result of all sessions' do
-      get :index, survey_id: survey, format: :json
+  it 'return json result of all sessions' do
+    get :index, survey_id: survey, format: :json
 
-      first_result = ActiveSupport::JSON.decode(response.body).first
+    first_result = ActiveSupport::JSON.decode(response.body).first
 
-      expect(first_result['answers'].first['code']).to eq 'string_answer_2'
-      expect(first_result['answers'].first['value']).to eq 'def, xyz'
-      expect(first_result['answers'].last['code']).to eq 'integer_answer_2'
-      expect(first_result['answers'].last['value']).to eq 456
+    expect(first_result['answers'].first['code']).to eq 'string_answer_2'
+    expect(first_result['answers'].first['value']).to eq 'def, xyz'
+    expect(first_result['answers'].last['code']).to eq 'integer_answer_2'
+    expect(first_result['answers'].last['value']).to eq 456
 
-      last_result = ActiveSupport::JSON.decode(response.body).last
+    last_result = ActiveSupport::JSON.decode(response.body).last
 
-      expect(last_result['answers'].first['code']).to eq 'string_answer_1'
-      expect(last_result['answers'].first['value']).to eq 'abc'
-      expect(last_result['answers'].last['code']).to eq 'integer_answer_1'
-      expect(last_result['answers'].last['value']).to eq 123
-    end
+    expect(last_result['answers'].first['code']).to eq 'string_answer_1'
+    expect(last_result['answers'].first['value']).to eq 'abc'
+    expect(last_result['answers'].last['code']).to eq 'integer_answer_1'
+    expect(last_result['answers'].last['value']).to eq 123
+  end
 
-    it 'return csv result of all sessions' do
-      get :index, survey_id: survey, format: :csv
+  it 'return csv result of all sessions' do
+    get :index, survey_id: survey, format: :csv
 
-      csv = CSV.parse(response.body)
-      %w(string_answer_2  integer_answer_2 string_answer_1 integer_answer_1).each do |code|
-        expect(csv.first).to include code
-      end
+    csv = CSV.parse(response.body)
+    %w(string_answer_2  integer_answer_2 string_answer_1 integer_answer_1).each do |code|
+      expect(csv.first).to include code
+    end
 
-      ['456', 'def, xyz'].each do |value|
-        expect(csv[1]).to include value
-      end
+    ['456', 'def, xyz'].each do |value|
+      expect(csv[1]).to include value
+    end
 
-      %w(123 abc).each do |value|
-        expect(csv[2]).to include value
-      end
+    %w(123 abc).each do |value|
+      expect(csv[2]).to include value
     end
+  end
 
-    specify 'csv header for all sessions does not allow same column names for answers and session fields' do
-      create :session, survey: survey, answers: [
-        build(:boolean_answer, code: 'completed', value: true),
-        build(:string_answer, code: 'token', value: 'abcdefghijklmnopqrstuvwxyz')
-      ]
-      get :index, survey_id: survey, format: :csv
-
-      csv = CSV.parse(response.body)
-      %w(answer_token  answer_completed).each do |code|
-        expect(csv.first).to include code
-      end
+  specify 'csv header for all sessions does not allow same column names for answers and session fields' do
+    question_group.questions.create code: 'completed', question_text: 'Good', _type: Helena::Questions::LongText
+    question_group.questions.create code: 'token', question_text: 'Point', _type: Helena::Questions::ShortText
+    create :session, survey: survey, answers: [
+      build(:boolean_answer, code: 'completed', value: true),
+      build(:string_answer, code: 'token', value: 'abcdefghijklmnopqrstuvwxyz')
+    ]
+    get :index, survey_id: survey, format: :csv
+
+    csv = CSV.parse(response.body)
+    %w(answer_token  answer_completed).each do |code|
+      expect(csv.first).to include code
     end
   end
 end

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

@@ -13,7 +13,7 @@ Rails.application.configure do
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
+  config.serve_static_files  = true
   config.static_cache_control = 'public, max-age=3600'
 
   # Show full error reports and disable caching.

data/spec/dummy/config/initializers/assets.rb

@@ -6,4 +6,4 @@ Rails.application.config.assets.version = '1.0'
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
 # Rails.application.config.assets.precompile += %w( search.js )
-Rails.application.config.assets.precompile += %w( codemirror.css polyfills.js helena_administration.css  )
+Rails.application.config.assets.precompile += %w( codemirror* codemirror/**/* polyfills.js helena_administration.css  )

data/spec/features/dashboard/index.html.slim_spec.rb

@@ -1,4 +1,4 @@
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Dashboard' do
   scenario 'User visits the index page that links to the survey management'  do

data/spec/features/question_groups/manage_question_groups_spec.rb

@@ -1,7 +1,6 @@
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Question groups' do
-
   let!(:survey) { create :survey }
   let!(:version) { survey.versions.create version: 0 }
 
@@ -45,7 +44,6 @@ describe 'Question groups' do
 
     expect(new_question_group.position).to eq 77
     expect(new_question_group.title).to eq 'Foo Bar'
-
   end
 
   scenario 'User edits question_group' do

data/spec/features/questions/manage_questions_spec.rb

@@ -1,4 +1,4 @@
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Questions' do
   let!(:survey) { create :survey }
@@ -33,6 +33,7 @@ describe 'Questions' do
 
     fill_in 'Code', with: 'a38'
     fill_in 'Question text', with: 'Shall we go?'
+    fill_in 'Position', with: 32
 
     within '.breadcrumbs' do
       expect(page).to have_text 'New question'
@@ -47,6 +48,8 @@ describe 'Questions' do
     fill_in 'Code', with: ''
 
     expect { click_button 'Save' }.to change { question_group.reload.questions.count }.by(0)
+
+    expect(page).to have_content "can't be blank"
   end
 
   scenario 'edits a question' do
@@ -56,11 +59,13 @@ describe 'Questions' do
 
     fill_in 'Question text', with: 'Are you sure?'
     fill_in 'Code', with: 'b12'
+    fill_in 'Position', with: 42
 
     click_button 'Save'
 
     expect(question.reload.question_text).to eq 'Are you sure?'
     expect(question.reload.code).to eq 'b12'
+    expect(question.reload.position).to eq 42
   end
 
   scenario 'edits a question errors when code text is empty' do

data/spec/features/questions/question_types/manage_bipolar_radio_matrix_question_spec.rb

@@ -0,0 +1,78 @@
+require 'spec_helper'
+
+describe 'Bipolar radio matrix question management' do
+  let!(:survey) { create :survey }
+  let!(:version) { survey.versions.create version: 0 }
+  let!(:question_group) { version.question_groups.create title: 'Abakadabara' }
+  let!(:question) { create :bipolar_radio_matrix_question, question_group: question_group }
+
+  scenario 'edits a question' do
+    question.labels.create text: 'Strongly disagree', value: '-1', position: 1
+    question.sub_questions.create code: 'aperto', text: 'Aperto Snacks', value: 'Aperto', position: 1
+
+    visit edit_survey_version_question_group_questions_bipolar_radio_matrix_path(survey, version, question_group, question)
+
+    check 'Required'
+
+    fill_in 'questions_bipolar_radio_matrix_labels_attributes_0_position', with: '2'
+    fill_in 'questions_bipolar_radio_matrix_labels_attributes_0_text', with: 'Strongly agree'
+    fill_in 'questions_bipolar_radio_matrix_labels_attributes_0_value', with: '1'
+    check 'questions_bipolar_radio_matrix_labels_attributes_0_preselected'
+
+    fill_in 'questions_bipolar_radio_matrix_sub_questions_attributes_0_position', with: '2'
+    fill_in 'questions_bipolar_radio_matrix_sub_questions_attributes_0_text', with: 'Avec Shop'
+    fill_in 'questions_bipolar_radio_matrix_sub_questions_attributes_0_code', with: 'avec'
+
+    click_button 'Save'
+
+    expect(question.reload.labels.first.position).to eq 2
+    expect(question.reload.labels.first.text).to eq 'Strongly agree'
+    expect(question.reload.labels.first.value).to eq '1'
+    expect(question.reload.labels.first.preselected).to eq true
+
+    expect(question.reload.sub_questions.first.position).to eq 2
+    expect(question.reload.sub_questions.first.text).to eq 'Avec Shop'
+    expect(question.reload.sub_questions.first.code).to eq 'avec'
+
+    expect(question.reload.required).to eq true
+  end
+
+  scenario 'adds a an option' do
+    visit edit_survey_version_question_group_questions_bipolar_radio_matrix_path(survey, version, question_group, question)
+
+    fill_in 'questions_bipolar_radio_matrix_labels_attributes_0_position', with: '2'
+    fill_in 'questions_bipolar_radio_matrix_labels_attributes_0_text', with: 'Strongly agree'
+    fill_in 'questions_bipolar_radio_matrix_labels_attributes_0_value', with: '1'
+    check 'questions_bipolar_radio_matrix_labels_attributes_0_preselected'
+
+    fill_in 'questions_bipolar_radio_matrix_sub_questions_attributes_0_position', with: '2'
+    fill_in 'questions_bipolar_radio_matrix_sub_questions_attributes_0_text', with: 'Avec Shop'
+    fill_in 'questions_bipolar_radio_matrix_sub_questions_attributes_0_code', with: 'avec'
+
+    click_button 'Save'
+
+    expect(question.reload.labels.first.position).to eq 2
+    expect(question.reload.labels.first.text).to eq 'Strongly agree'
+    expect(question.reload.labels.first.value).to eq '1'
+    expect(question.reload.labels.first.preselected).to eq true
+
+    expect(question.reload.sub_questions.first.position).to eq 2
+    expect(question.reload.sub_questions.first.text).to eq 'Avec Shop'
+    expect(question.reload.sub_questions.first.code).to eq 'avec'
+  end
+
+  scenario 'removes an option' do
+    question.labels.create text: 'Male', value: 'm', position: 1
+    question.sub_questions.create code: 'aperto', text: 'Aperto Snacks', value: 'Aperto', position: 1
+
+    visit edit_survey_version_question_group_questions_bipolar_radio_matrix_path(survey, version, question_group, question)
+
+    check 'questions_bipolar_radio_matrix_labels_attributes_0__destroy'
+    check 'questions_bipolar_radio_matrix_sub_questions_attributes_0__destroy'
+
+    click_button 'Save'
+
+    expect(question.reload.labels).to be_empty
+    expect(question.reload.sub_questions).to be_empty
+  end
+end

data/spec/features/questions/question_types/manage_checkbox_group_question_spec.rb

@@ -1,4 +1,4 @@
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Checkbox group question management' do
   let!(:survey) { create :survey }

data/spec/features/questions/question_types/manage_long_text_question_spec.rb

@@ -1,4 +1,4 @@
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Long text question management' do
   let!(:survey) { create :survey }

data/spec/features/questions/question_types/manage_radio_group_question_spec.rb

@@ -1,4 +1,4 @@
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Radio group question management' do
   let!(:survey) { create :survey }

data/spec/features/questions/question_types/manage_radio_matrix_question_spec.rb

@@ -1,4 +1,4 @@
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Radio matrix question management' do
   let!(:survey) { create :survey }

data/spec/features/questions/question_types/manage_short_text_question_spec.rb

@@ -1,4 +1,4 @@
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Short text question management' do
   let!(:survey) { create :survey }

data/spec/features/questions/question_types/manage_static_text_question_spec.rb

@@ -1,4 +1,4 @@
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Static text question management' do
   let!(:survey) { create :survey }

data/spec/features/sessions/manage_sessions_spec.rb

@@ -1,4 +1,4 @@
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Sessions' do
   let(:survey) { create :survey }
@@ -47,5 +47,7 @@ describe 'Sessions' do
     expect(session.reload.answers.map(&:value)).to eq ['c', 4]
     expect(session.reload.completed).to eq true
     expect(session.reload.last_question_group_id).to eq second_question_group.id
+
+    expect(page).not_to have_content 'RuntimeError'
   end
 end

data/spec/features/surveys/manage_survey_spec.rb

@@ -1,4 +1,4 @@
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Surveys' do
   scenario 'Index site lists all surveys'  do

data/spec/features/versions/manage_version_spec.rb

@@ -1,7 +1,6 @@
-require 'rails_helper'
+require 'spec_helper'
 
 describe 'Versions ' do
-
   let!(:survey) { create :survey }
   let!(:baseversion) { survey.versions.create version: 0 }
 
@@ -89,7 +88,6 @@ describe 'Versions ' do
     within "##{dom_id(inactive_version)}" do
       expect { click_link 'Delete' }.to change { survey.reload.versions.count }.by(-1)
     end
-
   end
 
   scenario 'User can view version details' do

data/spec/helpers/applicatin_helper_spec.rb

@@ -1,4 +1,4 @@
-require 'rails_helper'
+require 'spec_helper'
 
 describe HelenaAdministration::ApplicationHelper do
   describe '.title' do