Skip to content

Commit 6f9aed8

Browse files
committed
Merge branch 'rubocop' of https://github.com/fwininger/wicked_pdf into fwininger-rubocop
2 parents f8abe70 + ce7fbf2 commit 6f9aed8

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

.rubocop_todo.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This configuration was generated by
22
# `rubocop --auto-gen-config`
3-
# on 2019-10-02 17:54:14 +0200 using RuboCop version 0.68.1.
3+
# on 2019-10-09 14:16:04 +0200 using RuboCop version 0.68.1.
44
# The point is for the user to remove these configuration records
55
# one by one as the offenses are removed from the code base.
66
# Note that changes in the inspected code, or installation of new

Rakefile

+1-7
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ end
1717

1818
desc 'Run RuboCop'
1919
task :rubocop do
20-
next unless RUBY_VERSION >= '2.0.0'
21-
2220
require 'rubocop/rake_task'
2321
RuboCop::RakeTask.new
2422
end
@@ -33,11 +31,7 @@ desc 'Generate dummy application for test cases'
3331
task :dummy_generate do
3432
Rake::Task[:dummy_remove].invoke
3533
puts 'Creating dummy application to run tests'
36-
if Rails::VERSION::MAJOR > 2
37-
system('rails new test/dummy --database=sqlite3')
38-
else
39-
system('rails test/dummy')
40-
end
34+
system('rails new test/dummy --database=sqlite3')
4135
system('touch test/dummy/db/schema.rb')
4236
FileUtils.cp 'test/fixtures/database.yml', 'test/dummy/config/'
4337
FileUtils.rm_r Dir.glob('test/dummy/test/*')

0 commit comments

Comments
 (0)