rapidfire 4.0.0 → 8.0.0

data/spec/services/rapidfire/attempt_builder_spec.rb

@@ -1,9 +1,13 @@
 require 'spec_helper'
 
+def fixture_file_upload(path, mime_type)
+  Rack::Test::UploadedFile.new(Pathname.new(file_fixture_path).join(path), mime_type, false)
+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
@@ -28,11 +32,6 @@ describe Rapidfire::AttemptBuilder do
     end
     let(:save_answers)  { builder.save }
 
-    before do
-      [question1, question2]
-      save_answers
-    end
-
     context "when all the answers are valid" do
       let(:answer_params) do
         {
@@ -46,6 +45,7 @@ describe Rapidfire::AttemptBuilder do
       end
 
       it "successfully saves answers" do
+        save_answers
         builder.answers.each do |answer|
           expect(answer).to be_persisted
           expect(question_ids).to include(answer.question_id)
@@ -66,21 +66,69 @@ describe Rapidfire::AttemptBuilder do
       end
 
       it "fails to save those answers" do
+        save_answers
         expect(Rapidfire::Answer.count).to eq(0)
       end
 
-      context "when requested to save without validations" do
-        let(:save_answers)  { builder.save(:validate => false) }
+      if Rails::VERSION::MAJOR < 5
+        context "when requested to save without validations" do
+          let(:save_answers)  { builder.save(:validate => false) }
+
+          it "returns true" do
+            expect(save_answers).to be_truthy
+          end
+
+          it "saves all the answers" do
+            save_answers
+            builder.answers.each do |answer|
+              expect(answer).to be_persisted
+              expect(question_ids).to include(answer.question_id)
+            end
+          end
+        end
+      end
+    end
+
+    if "#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}" >= "5.2"
+      context "with a single file upload question" do
+        let(:question3) { FactoryBot.create(:q_file, survey: survey) }
 
-        it "returns true" do
+        let(:answer_params) do
+          {
+            question1.id.to_s => { :answer_text => "short answer" },
+            question2.id.to_s => { :answer_text => "long answer" },
+            question3.id.to_s => { :file => fixture_file_upload("one.txt", "text/plain") }
+          }
+        end
+
+        it "saves the file successfully" do
           expect(save_answers).to be_truthy
+
+          answer = Rapidfire::Answer.last
+          expect(answer).to be_persisted
+          expect(answer.file.download).to eq("one\n")
         end
+      end
 
-        it "saves all the answers" do
-          builder.answers.each do |answer|
-            expect(answer).to be_persisted
-            expect(question_ids).to include(answer.question_id)
-          end
+      context "with multiple files upload question" do
+        let(:question3) { FactoryBot.create(:q_multifile, survey: survey) }
+
+        let(:answer_params) do
+          {
+            question1.id.to_s => { :answer_text => "short answer" },
+            question2.id.to_s => { :answer_text => "long answer" },
+            question3.id.to_s => { :files => [fixture_file_upload("one.txt", "text/plain"),
+                                              fixture_file_upload("two.txt", "text/plain")]}
+          }
+        end
+
+        it "saves the file successfully" do
+          expect(save_answers).to be_truthy
+
+          answer = Rapidfire::Answer.last
+          expect(answer).to be_persisted
+          expect(answer.files[0].download).to eq("one\n")
+          expect(answer.files[1].download).to eq("two\n")
         end
       end
     end

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