From d5d653862a93dde971075705e9290f376a3f9756 Mon Sep 17 00:00:00 2001 From: fonglh Date: Mon, 29 Aug 2016 22:26:16 +0800 Subject: [PATCH 1/3] Force test report encoding to UTF-8. Originally ASCII-8BIT which causes problems for `to_json` later in the Flexirest gem. --- .../evaluator/services/evaluate_programming_package_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/coursemology/evaluator/services/evaluate_programming_package_service.rb b/lib/coursemology/evaluator/services/evaluate_programming_package_service.rb index 3127cec..516b359 100644 --- a/lib/coursemology/evaluator/services/evaluate_programming_package_service.rb +++ b/lib/coursemology/evaluator/services/evaluate_programming_package_service.rb @@ -125,7 +125,7 @@ def extract_test_report(container) tar_file = Gem::Package::TarReader.new(stream) tar_file.each do |file| - return file.read + return file.read.force_encoding(Encoding::UTF_8) end rescue Docker::Error::NotFoundError return nil From 2420fbb9acf584b9dd6f6d6d674d221bb7df3496 Mon Sep 17 00:00:00 2001 From: fonglh Date: Mon, 29 Aug 2016 22:54:09 +0800 Subject: [PATCH 2/3] Test encoding of extracted test report. --- .../services/evaluate_programming_package_service_spec.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spec/coursemology/evaluator/services/evaluate_programming_package_service_spec.rb b/spec/coursemology/evaluator/services/evaluate_programming_package_service_spec.rb index 505c7b9..8a4e02d 100644 --- a/spec/coursemology/evaluator/services/evaluate_programming_package_service_spec.rb +++ b/spec/coursemology/evaluator/services/evaluate_programming_package_service_spec.rb @@ -120,7 +120,9 @@ def copy_dummy_report it 'returns the test report' do copy_dummy_report - expect(subject.send(:extract_test_report, container)).to eq(report_contents) + test_report = subject.send(:extract_test_report, container) + expect(test_report).to eq(report_contents) + expect(test_report.encoding).to eq Encoding::UTF_8 end context 'when running the tests fails' do From 1fcfdb97a3790c94b597317e10342a12786d4388 Mon Sep 17 00:00:00 2001 From: fonglh Date: Tue, 30 Aug 2016 14:52:09 +0800 Subject: [PATCH 3/3] Version bump to 0.1.7. --- lib/coursemology/evaluator/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/coursemology/evaluator/version.rb b/lib/coursemology/evaluator/version.rb index 0fa69dd..9fef240 100644 --- a/lib/coursemology/evaluator/version.rb +++ b/lib/coursemology/evaluator/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module Coursemology; end module Coursemology::Evaluator - VERSION = '0.1.5'.freeze + VERSION = '0.1.7'.freeze end