Skip to content

Commit ff43ac0

Browse files
authored
Merge pull request #1014 from senid231/1013-fix-bug-report-template-execution-through-rake-default
require bundler in bug_report_templates_test
2 parents 4543a96 + ec3f673 commit ff43ac0

File tree

3 files changed

+31
-29
lines changed

3 files changed

+31
-29
lines changed

Rakefile

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,28 @@ Rake::TestTask.new do |t|
88
t.test_files = FileList['test/**/*_test.rb']
99
end
1010

11-
task default: :test
11+
task default: [:test, 'test:bug_report_template:rails_5']
1212

1313
desc 'Run benchmarks'
1414
namespace :test do
1515
Rake::TestTask.new(:benchmark) do |t|
1616
t.pattern = 'test/benchmark/*_benchmark.rb'
1717
end
1818
end
19+
20+
desc 'Test bug report template'
21+
namespace :test do
22+
namespace :bug_report_template do
23+
task :rails_5 do
24+
puts 'Test bug report templates'
25+
jsonapi_resources_root = File.expand_path('..', __FILE__)
26+
chdir_path = File.join(jsonapi_resources_root, 'lib', 'bug_report_templates')
27+
report_env = {'SILENT' => 'true', 'JSONAPI_RESOURCES_PATH' => jsonapi_resources_root}
28+
Bundler.with_clean_env do
29+
Dir.chdir(chdir_path) do
30+
abort('bug report template rails_5_master fails') unless system(report_env, Gem.ruby, 'rails_5_master.rb')
31+
end
32+
end
33+
end
34+
end
35+
end

lib/bug_report_templates/rails_5_master.rb

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
begin
22
require 'bundler/inline'
3+
require 'bundler'
34
rescue LoadError => e
45
STDERR.puts 'Bundler version 1.10 or later is required. Please update your Bundler'
56
raise e
67
end
78

8-
gemfile(true) do
9+
gemfile(true, ui: ENV['SILENT'] ? Bundler::UI::Silent.new : Bundler::UI::Shell.new) do
910
source 'https://rubygems.org'
1011

1112
gem 'rails', require: false
@@ -27,8 +28,17 @@
2728
# prepare active_record database
2829
require 'active_record'
2930

31+
class NullLogger < Logger
32+
def initialize(*_args)
33+
end
34+
35+
def add(*_args, &_block)
36+
end
37+
end
38+
3039
ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
31-
ActiveRecord::Base.logger = Logger.new(STDOUT)
40+
ActiveRecord::Base.logger = ENV['SILENT'] ? NullLogger.new : Logger.new(STDOUT)
41+
ActiveRecord::Migration.verbose = !ENV['SILENT']
3242

3343
ActiveRecord::Schema.define do
3444
# Add your schema here
@@ -61,7 +71,7 @@ class YourModelResource < JSONAPI::Resource
6171

6272
class TestApp < Rails::Application
6373
config.root = File.dirname(__FILE__)
64-
config.logger = Logger.new(STDOUT)
74+
config.logger = ENV['SILENT'] ? NullLogger.new : Logger.new(STDOUT)
6575
Rails.logger = config.logger
6676

6777
secrets.secret_token = 'secret_token'

test/bug_report_templates_test.rb

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)