rapidfire 5.0.0 → 8.0.0

data/spec/factories/answers_factory.rb

@@ -1,7 +1,7 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :answer, :class => "Rapidfire::Answer" do
-    attempt  { FactoryGirl.create(:attempt) }
-    question      { FactoryGirl.create(:q_long)       }
-    answer_text   "hello world"
+    attempt  { FactoryBot.create(:attempt) }
+    question      { FactoryBot.create(:q_long)       }
+    answer_text   { "hello world" }
   end
 end

data/spec/factories/attempts_factory.rb

@@ -1,5 +1,5 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :attempt, :class => "Rapidfire::Attempt" do
-    survey  { FactoryGirl.create(:survey) }
+    survey  { FactoryBot.create(:survey) }
   end
 end

data/spec/factories/questions_factory.rb

@@ -1,10 +1,10 @@
-FactoryGirl.define do
-  factory :question do
-    survey  { FactoryGirl.create(:survey) }
-    question_text   "Sample Question"
+FactoryBot.define do
+  factory :question, :class => "Rapidfire::Question" do
+    survey  { FactoryBot.create(:survey) }
+    question_text   { "Sample Question" }
 
     factory :q_checkbox, :class => "Rapidfire::Questions::Checkbox" do
-      answer_options  "hindi\r\ntelugu\r\nkannada\r\n"
+      answer_options  { "hindi\r\ntelugu\r\nkannada\r\n" }
     end
 
     factory :q_date, :class => "Rapidfire::Questions::Date" do
@@ -17,11 +17,11 @@ FactoryGirl.define do
     end
 
     factory :q_radio, :class => "Rapidfire::Questions::Radio" do
-      answer_options  "male\r\nfemale\r\n"
+      answer_options  { "male\r\nfemale\r\n" }
     end
 
     factory :q_select, :class => "Rapidfire::Questions::Select" do
-      answer_options  "mac\r\nwindows\r\n"
+      answer_options  { "mac\r\nwindows\r\n" }
     end
 
     factory :q_short, :class => "Rapidfire::Questions::Short" do

data/spec/factories/surveys_factory.rb

@@ -1,6 +1,6 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :survey, :class => "Rapidfire::Survey" do
-    name  "Test Survey"
-    introduction "Please answer all the questions in this survey."
+    name  { "Test Survey" }
+    introduction { "Please answer all the questions in this survey." }
   end
 end

data/spec/factories/users_factory.rb

@@ -1,5 +1,5 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :user do
-    name  "Test User"
+    name  { "Test User" }
   end
 end

data/spec/features/rapidfire/answering_questions_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe "Surveys" do
-  let!(:survey) { FactoryGirl.create(:survey, name: "Question Set", introduction: "Some introduction") }
+  let!(:survey) { FactoryBot.create(:survey, name: "Question Set", introduction: "Some introduction") }
 
   it "displays survey introduction" do
     visit rapidfire.new_survey_attempt_path(survey)
@@ -10,10 +10,10 @@ describe "Surveys" do
   end
 
   describe "Answering Questions" do
-    let!(:question1) { FactoryGirl.create(:q_long,  survey: survey, question_text: "Long Question", validation_rules: { presence: "1" })  }
-    let!(:question2) { FactoryGirl.create(:q_short, survey: survey, question_text: "Short Question") }
-    let!(:question3) { FactoryGirl.create(:q_checkbox, survey: survey, question_text: "Checkbox question") }
-    let!(:question4) { FactoryGirl.create(:q_checkbox, survey: survey, question_text: "Checkbox question", validation_rules: { presence: "1" }) }
+    let!(:question1) { FactoryBot.create(:q_long,  survey: survey, question_text: "Long Question", validation_rules: { presence: "1" })  }
+    let!(:question2) { FactoryBot.create(:q_short, survey: survey, question_text: "Short Question") }
+    let!(:question3) { FactoryBot.create(:q_checkbox, survey: survey, question_text: "Checkbox question") }
+    let!(:question4) { FactoryBot.create(:q_checkbox, survey: survey, question_text: "Checkbox question", validation_rules: { presence: "1" }) }
 
     before do
       visit rapidfire.new_survey_attempt_path(survey)
@@ -56,7 +56,7 @@ describe "Surveys" do
         end
 
         it "shows error for missing answers" do
-          expect(page).to have_content("can't be blank", count: 2)
+          expect(page).to have_content("can't be blank", count: 3)
         end
 
         it "shows already populated answers" do
@@ -92,7 +92,7 @@ describe "Surveys" do
   if "#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}" >= "5.2"
     describe "Answering File uploads" do
       context "when the question is single file upload" do
-        let!(:question1) { FactoryGirl.create(:q_file,  survey: survey, question_text: "Avatar")  }
+        let!(:question1) { FactoryBot.create(:q_file,  survey: survey, question_text: "Avatar")  }
 
         it "persistes the file" do
           visit rapidfire.new_survey_attempt_path(survey)
@@ -107,7 +107,7 @@ describe "Surveys" do
       end
 
       context "when the question is multi file upload" do
-        let!(:question1) { FactoryGirl.create(:q_multifile,  survey: survey, question_text: "Images")  }
+        let!(:question1) { FactoryBot.create(:q_multifile,  survey: survey, question_text: "Images")  }
 
         it "persistes the file" do
           visit rapidfire.new_survey_attempt_path(survey)
@@ -123,6 +123,23 @@ describe "Surveys" do
           expect(answer.files[1].download).to eq("one\n")
         end
       end
+
+      context "when persisting a file fails" do
+        let!(:question1) { FactoryBot.create(:q_file,  survey: survey, question_text: "Avatar")  }
+
+        it "bubbles up the error" do
+          visit rapidfire.new_survey_attempt_path(survey)
+
+          expect_any_instance_of(Rapidfire::Answer).to receive("file_attachment=") do
+            raise ActiveRecord::ActiveRecordError.new("Can't save the file")
+          end
+
+          attach_file "attempt_#{question1.id}_file", file_fixture("one.txt")
+          click_button "Save"
+
+          expect(page).to have_content("Can't save the file")
+        end
+      end
     end
   end
 end

data/spec/features/rapidfire/editing_answers_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
 describe "Surveys" do
-  let(:survey)  { FactoryGirl.create(:survey, name: "Question Set") }
-  let(:question1)  { FactoryGirl.create(:q_long,  survey: survey, question_text: "Long Question", validation_rules: { presence: "1" })  }
-  let(:question2)  { FactoryGirl.create(:q_short, survey: survey, question_text: "Short Question") }
-  let(:attempt) { FactoryGirl.create(:attempt, survey: survey) }
-  let!(:answer1) { FactoryGirl.create(:answer, attempt: attempt, question: question1, answer_text: "Long Answer") }
-  let!(:answer2) { FactoryGirl.create(:answer, attempt: attempt, question: question2, answer_text: "Short Answer") }
+  let(:survey)  { FactoryBot.create(:survey, name: "Question Set") }
+  let(:question1)  { FactoryBot.create(:q_long,  survey: survey, question_text: "Long Question", validation_rules: { presence: "1" })  }
+  let(:question2)  { FactoryBot.create(:q_short, survey: survey, question_text: "Short Question") }
+  let(:attempt) { FactoryBot.create(:attempt, survey: survey) }
+  let!(:answer1) { FactoryBot.create(:answer, attempt: attempt, question: question1, answer_text: "Long Answer") }
+  let!(:answer2) { FactoryBot.create(:answer, attempt: attempt, question: question2, answer_text: "Short Answer") }
   before do
     visit rapidfire.edit_survey_attempt_path(survey, attempt)
   end

data/spec/features/rapidfire/managing_questions_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
 describe "Questions" do
-  let(:survey)  { FactoryGirl.create(:survey, name: "Question Set") }
-  let(:question1)  { FactoryGirl.create(:q_long,  survey: survey, question_text: "Long Question")  }
-  let(:question2)  { FactoryGirl.create(:q_short, survey: survey, question_text: "Short Question") }
+  let(:survey)  { FactoryBot.create(:survey, name: "Question Set") }
+  let(:question1)  { FactoryBot.create(:q_long,  survey: survey, question_text: "Long Question")  }
+  let(:question2)  { FactoryBot.create(:q_short, survey: survey, question_text: "Short Question") }
   before do
     [question1, question2]
   end

data/spec/features/rapidfire/managing_surveys_spec.rb

@@ -4,9 +4,9 @@ describe "Surveys" do
   include Rapidfire::QuestionSpecHelper
   include Rapidfire::AnswerSpecHelper
 
-  let(:survey)  { FactoryGirl.create(:survey, name: "Question Set") }
-  let(:question1)  { FactoryGirl.create(:q_long,  survey: survey, question_text: "Long Question")  }
-  let(:question2)  { FactoryGirl.create(:q_short, survey: survey, question_text: "Short Question") }
+  let(:survey)  { FactoryBot.create(:survey, name: "Question Set") }
+  let(:question1)  { FactoryBot.create(:q_long,  survey: survey, question_text: "Long Question")  }
+  let(:question2)  { FactoryBot.create(:q_short, survey: survey, question_text: "Short Question") }
   before do
     [question1, question2]
   end
@@ -94,6 +94,21 @@ describe "Surveys" do
         expect(page).not_to have_link "New Survey"
       end
     end
+
+    context "when creating a survey fails" do
+      before do
+        allow_any_instance_of(ApplicationController).to receive(:can_administer?).and_return(true)
+      end
+
+      it "throws an error message" do
+        visit rapidfire.root_path
+        click_link "New Survey"
+
+        click_button "Create Survey"
+
+        expect(page).to have_content "Name can't be blank"
+      end
+    end
   end
 
   describe "EDITING Surveys" do

data/spec/models/rapidfire/answer_spec.rb

@@ -2,12 +2,12 @@ require 'spec_helper'
 
 describe Rapidfire::Answer do
   describe "Validations" do
-    subject { FactoryGirl.build(:answer) }
+    subject { FactoryBot.build(:answer) }
     it { is_expected.to validate_presence_of(:question)      }
     it { is_expected.to validate_presence_of(:attempt)  }
 
     context "when validations are run" do
-      let(:answer)  { FactoryGirl.build(:answer) }
+      let(:answer)  { FactoryBot.build(:answer) }
 
       it "delegates validation of answer text to question" do
         expect(answer.question).to receive(:validate_answer).with(answer).once

data/spec/models/rapidfire/question_spec.rb

@@ -11,7 +11,7 @@ describe Rapidfire::Question do
   end
 
   describe "#rules" do
-    let(:question)  { FactoryGirl.create(:q_long, validation_rules: validation_rules) }
+    let(:question)  { FactoryBot.create(:q_long, validation_rules: validation_rules) }
 
     context "when there are no validation rules" do
       let(:validation_rules) { {} }
@@ -33,8 +33,8 @@ describe Rapidfire::Question do
   end
 
   describe "validate_answer" do
-    let(:question)  { FactoryGirl.create(:q_long, validation_rules: validation_rules) }
-    let(:answer)    { FactoryGirl.build(:answer, question: question, answer_text: answer_text) }
+    let(:question)  { FactoryBot.create(:q_long, validation_rules: validation_rules) }
+    let(:answer)    { FactoryBot.build(:answer, question: question, answer_text: answer_text) }
     before  { answer.valid? }
 
     context "when there are no validation rules" do

data/spec/models/rapidfire/questions/checkbox_spec.rb

@@ -6,7 +6,7 @@ describe Rapidfire::Questions::Checkbox do
   end
 
   describe "#options" do
-    let(:question)  { FactoryGirl.create(:q_select) }
+    let(:question)  { FactoryBot.create(:q_select) }
 
     it "returns options" do
       expect(question.options).to match_array(["mac", "windows"])
@@ -14,8 +14,8 @@ describe Rapidfire::Questions::Checkbox do
   end
 
   describe "validate_answer" do
-    let(:question)  { FactoryGirl.create(:q_checkbox, validation_rules: validation_rules) }
-    let(:answer)    { FactoryGirl.build(:answer, question: question, answer_text: answer_text) }
+    let(:question)  { FactoryBot.create(:q_checkbox, validation_rules: validation_rules) }
+    let(:answer)    { FactoryBot.build(:answer, question: question, answer_text: answer_text) }
     before  { answer.valid? }
 
     context "when there are no validation rules" do

data/spec/models/rapidfire/questions/date_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe Rapidfire::Questions::Date do
   describe "validate_answer" do
-    let(:question)  { FactoryGirl.create(:q_date, validation_rules: validation_rules) }
-    let(:answer)    { FactoryGirl.build(:answer, question: question, answer_text: answer_text) }
+    let(:question)  { FactoryBot.create(:q_date, validation_rules: validation_rules) }
+    let(:answer)    { FactoryBot.build(:answer, question: question, answer_text: answer_text) }
     before  { answer.valid? }
 
     context "when there are no validation rules" do

data/spec/models/rapidfire/questions/file_spec.rb

@@ -16,8 +16,8 @@ describe Rapidfire::Questions::File do
 
   if "#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}" >= "5.2"
     describe "validate_answer" do
-      let(:question) { FactoryGirl.create(:q_file, validation_rules: validation_rules) }
-      let(:answer) { FactoryGirl.build(:answer, question: question, file: file) }
+      let(:question) { FactoryBot.create(:q_file, validation_rules: validation_rules) }
+      let(:answer) { FactoryBot.build(:answer, question: question, file: file) }
       before  { answer.valid? }
 
       context "when there are no validation rules" do

data/spec/models/rapidfire/questions/multi_file_spec.rb

@@ -16,8 +16,8 @@ describe Rapidfire::Questions::MultiFile do
 
   if "#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}" >= "5.2"
     describe "validate_answer" do
-      let(:question) { FactoryGirl.create(:q_multifile, validation_rules: validation_rules) }
-      let(:answer) { FactoryGirl.build(:answer, question: question, files: files) }
+      let(:question) { FactoryBot.create(:q_multifile, validation_rules: validation_rules) }
+      let(:answer) { FactoryBot.build(:answer, question: question, files: files) }
       before  { answer.valid? }
 
       context "when there are no validation rules" do

data/spec/models/rapidfire/questions/numeric_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe Rapidfire::Questions::Numeric do
   describe "validate_answer" do
-    let(:question)  { FactoryGirl.create(:q_numeric, validation_rules: validation_rules) }
-    let(:answer)    { FactoryGirl.build(:answer, question: question, answer_text: answer_text) }
+    let(:question)  { FactoryBot.create(:q_numeric, validation_rules: validation_rules) }
+    let(:answer)    { FactoryBot.build(:answer, question: question, answer_text: answer_text) }
     before  { answer.valid? }
 
     context "when there are no validation rules" do

data/spec/models/rapidfire/questions/select_spec.rb

@@ -6,7 +6,7 @@ describe Rapidfire::Questions::Select do
   end
 
   describe "#options" do
-    let(:question)  { FactoryGirl.create(:q_select) }
+    let(:question)  { FactoryBot.create(:q_select) }
 
     it "returns options" do
       expect(question.options).to match_array(["mac", "windows"])
@@ -14,8 +14,8 @@ describe Rapidfire::Questions::Select do
   end
 
   describe "validate_answer" do
-    let(:question)  { FactoryGirl.create(:q_select, validation_rules: validation_rules) }
-    let(:answer)    { FactoryGirl.build(:answer, question: question, answer_text: answer_text) }
+    let(:question)  { FactoryBot.create(:q_select, validation_rules: validation_rules) }
+    let(:answer)    { FactoryBot.build(:answer, question: question, answer_text: answer_text) }
     before  { answer.valid? }
 
     context "when there are no validation rules" do

data/spec/models/rapidfire/survey_spec.rb

@@ -12,7 +12,7 @@ describe Rapidfire::Survey do
   end
 
   describe "factory" do
-    let(:survey) { FactoryGirl.create(:survey) }
+    let(:survey) { FactoryBot.create(:survey) }
 
     it "has a name" do
       expect(survey.name).to eql("Test Survey")

data/spec/serializers/rapidfire/question_result_serializer_spec.rb

@@ -4,7 +4,7 @@ describe Rapidfire::QuestionResultSerializer do
   include Rapidfire::QuestionSpecHelper
   include Rapidfire::AnswerSpecHelper
 
-  let(:survey) { FactoryGirl.create(:survey) }
+  let(:survey) { FactoryBot.create(:survey) }
   let(:results) do
     Rapidfire::SurveyResults.new(survey: survey).extract
   end

data/spec/services/rapidfire/attempt_builder_spec.rb

@@ -5,9 +5,9 @@ def fixture_file_upload(path, mime_type)
 end
 
 describe Rapidfire::AttemptBuilder do
-  let(:survey)  { FactoryGirl.create(:survey) }
-  let(:question1)  { FactoryGirl.create(:q_short, survey: survey) }
-  let(:question2)  { FactoryGirl.create(:q_long, survey: survey,
+  let(:survey)  { FactoryBot.create(:survey) }
+  let(:question1)  { FactoryBot.create(:q_short, survey: survey) }
+  let(:question2)  { FactoryBot.create(:q_long, survey: survey,
                                         validation_rules: { presence: "1" }) }
 
   describe "Creation" do
@@ -91,7 +91,7 @@ describe Rapidfire::AttemptBuilder do
 
     if "#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}" >= "5.2"
       context "with a single file upload question" do
-        let(:question3) { FactoryGirl.create(:q_file, survey: survey) }
+        let(:question3) { FactoryBot.create(:q_file, survey: survey) }
 
         let(:answer_params) do
           {
@@ -111,7 +111,7 @@ describe Rapidfire::AttemptBuilder do
       end
 
       context "with multiple files upload question" do
-        let(:question3) { FactoryGirl.create(:q_multifile, survey: survey) }
+        let(:question3) { FactoryBot.create(:q_multifile, survey: survey) }
 
         let(:answer_params) do
           {

data/spec/services/rapidfire/question_form_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Rapidfire::QuestionForm do
-  let(:survey)  { FactoryGirl.create(:survey) }
+  let(:survey)  { FactoryBot.create(:survey) }
 
   describe "Creation" do
     let(:proxy)  { described_class.new(survey: survey) }
@@ -19,7 +19,7 @@ describe Rapidfire::QuestionForm do
     end
 
     context "when a question is passed" do
-      let(:question)  { FactoryGirl.create(:q_checkbox, survey: survey) }
+      let(:question)  { FactoryBot.create(:q_checkbox, survey: survey) }
       let(:proxy)     { described_class.new(survey: survey, question: question) }
 
       it "persists question params" do
@@ -75,7 +75,7 @@ describe Rapidfire::QuestionForm do
     end
 
     context "updating a question" do
-      let(:question)  { FactoryGirl.create(:q_checkbox, survey: survey) }
+      let(:question)  { FactoryBot.create(:q_checkbox, survey: survey) }
       let(:proxy) do
         proxy_params = params.merge(survey: survey, question: question)
         described_class.new(proxy_params)

data/spec/services/rapidfire/survey_results_spec.rb

@@ -4,7 +4,7 @@ describe Rapidfire::SurveyResults do
   include Rapidfire::QuestionSpecHelper
   include Rapidfire::AnswerSpecHelper
 
-  let(:survey) { FactoryGirl.create(:survey) }
+  let(:survey) { FactoryBot.create(:survey) }
 
   describe '#extract' do
     before do

data/spec/spec_helper.rb

@@ -4,7 +4,7 @@ require File.expand_path("../dummy/config/environment", __FILE__)
 require 'rspec/rails'
 
 require 'capybara/rails'
-require 'factory_girl_rails'
+require 'factory_bot_rails'
 require 'database_cleaner'
 require 'shoulda'
 

data/spec/support/rapidfire/answer_spec_helper.rb

@@ -1,22 +1,22 @@
 module Rapidfire
   module AnswerSpecHelper
     def create_answers
-      FactoryGirl.create(:answer, :question => @question_checkbox, :answer_text => 'hindi')
-      FactoryGirl.create(:answer, :question => @question_checkbox, :answer_text => "hindi\r\ntelugu")
-      FactoryGirl.create(:answer, :question => @question_checkbox, :answer_text => "hindi\r\nkannada")
+      FactoryBot.create(:answer, :question => @question_checkbox, :answer_text => 'hindi')
+      FactoryBot.create(:answer, :question => @question_checkbox, :answer_text => "hindi\r\ntelugu")
+      FactoryBot.create(:answer, :question => @question_checkbox, :answer_text => "hindi\r\nkannada")
 
-      FactoryGirl.create(:answer, :question => @question_select, :answer_text => 'mac')
-      FactoryGirl.create(:answer, :question => @question_select, :answer_text => 'mac')
-      FactoryGirl.create(:answer, :question => @question_select, :answer_text => 'windows')
+      FactoryBot.create(:answer, :question => @question_select, :answer_text => 'mac')
+      FactoryBot.create(:answer, :question => @question_select, :answer_text => 'mac')
+      FactoryBot.create(:answer, :question => @question_select, :answer_text => 'windows')
 
-      FactoryGirl.create(:answer, :question => @question_radio, :answer_text => 'male')
-      FactoryGirl.create(:answer, :question => @question_radio, :answer_text => 'female')
+      FactoryBot.create(:answer, :question => @question_radio, :answer_text => 'male')
+      FactoryBot.create(:answer, :question => @question_radio, :answer_text => 'female')
 
       3.times do
-        FactoryGirl.create(:answer, :question => @question_date, :answer_text => Date.today.to_s)
-        FactoryGirl.create(:answer, :question => @question_long, :answer_text => 'my bio goes on and on!')
-        FactoryGirl.create(:answer, :question => @question_numeric, :answer_text => 999)
-        FactoryGirl.create(:answer, :question => @question_short, :answer_text => 'this is cool')
+        FactoryBot.create(:answer, :question => @question_date, :answer_text => Date.today.to_s)
+        FactoryBot.create(:answer, :question => @question_long, :answer_text => 'my bio goes on and on!')
+        FactoryBot.create(:answer, :question => @question_numeric, :answer_text => 999)
+        FactoryBot.create(:answer, :question => @question_short, :answer_text => 'this is cool')
       end
     end
   end

data/spec/support/rapidfire/question_spec_helper.rb

@@ -1,13 +1,13 @@
 module Rapidfire
   module QuestionSpecHelper
     def create_questions(survey)
-      @question_checkbox = FactoryGirl.create(:q_checkbox, :survey => survey)
-      @question_date = FactoryGirl.create(:q_date, :survey => survey)
-      @question_long = FactoryGirl.create(:q_long, :survey => survey)
-      @question_numeric = FactoryGirl.create(:q_numeric, :survey => survey)
-      @question_radio = FactoryGirl.create(:q_radio, :survey => survey)
-      @question_select = FactoryGirl.create(:q_select, :survey => survey)
-      @question_short = FactoryGirl.create(:q_short, :survey => survey)
+      @question_checkbox = FactoryBot.create(:q_checkbox, :survey => survey)
+      @question_date = FactoryBot.create(:q_date, :survey => survey)
+      @question_long = FactoryBot.create(:q_long, :survey => survey)
+      @question_numeric = FactoryBot.create(:q_numeric, :survey => survey)
+      @question_radio = FactoryBot.create(:q_radio, :survey => survey)
+      @question_select = FactoryBot.create(:q_select, :survey => survey)
+      @question_short = FactoryBot.create(:q_short, :survey => survey)
     end
   end
 end

data/spec/tasks/change_delimiter_from_comma_to_srsn_spec.rb

@@ -9,18 +9,18 @@ describe 'rapidfire:change_delimiter_from_comma_to_srsn' do
   end
 
   it 'converts select,radio and checkbox answer options delimiter from , to \r\n' do
-    survey = FactoryGirl.create(:survey)
-    q_checkbox = FactoryGirl.create(:q_checkbox, survey: survey,
+    survey = FactoryBot.create(:survey)
+    q_checkbox = FactoryBot.create(:q_checkbox, survey: survey,
                                     answer_options: 'one,two,three')
-    q_radio = FactoryGirl.create(:q_radio, survey: survey,
+    q_radio = FactoryBot.create(:q_radio, survey: survey,
                                  answer_options: 'hello,world')
-    q_select = FactoryGirl.create(:q_select, survey: survey,
+    q_select = FactoryBot.create(:q_select, survey: survey,
                                   answer_options: 'new,old,historic,')
 
-    q_date = FactoryGirl.create(:q_date, survey: survey)
-    q_long = FactoryGirl.create(:q_long, survey: survey)
-    q_numeric = FactoryGirl.create(:q_numeric, survey: survey)
-    q_short = FactoryGirl.create(:q_short, survey: survey)
+    q_date = FactoryBot.create(:q_date, survey: survey)
+    q_long = FactoryBot.create(:q_long, survey: survey)
+    q_numeric = FactoryBot.create(:q_numeric, survey: survey)
+    q_short = FactoryBot.create(:q_short, survey: survey)
 
     Rake::Task['rapidfire:change_delimiter_from_comma_to_srsn'].invoke