From 8d25b7227f3eb3efb92de2d2ff57e83aed47e8b6 Mon Sep 17 00:00:00 2001 From: Kornelius Kalnbach Date: Sun, 24 Nov 2019 16:21:29 +0100 Subject: add spec for CodeRay.coderay_path --- spec/coderay_spec.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/spec/coderay_spec.rb b/spec/coderay_spec.rb index 2c7b91e..8a299b3 100644 --- a/spec/coderay_spec.rb +++ b/spec/coderay_spec.rb @@ -1,9 +1,16 @@ require File.expand_path('../spec_helper', __FILE__) RSpec.describe CodeRay do - describe 'version' do + describe '::VERSION' do it "returns the Gem's version" do expect(CodeRay::VERSION).to match(/\A\d\.\d\.\d?\z/) end end + + describe '.coderay_path' do + it 'returns an absolute file path to the given code file' do + base = File.expand_path('../..', __FILE__) + expect(CodeRay.coderay_path('file')).to eq("#{base}/lib/coderay/file") + end + end end -- cgit v1.2.1 From 69ec4d90ee666563d32341f81b388dd25c3cbbff Mon Sep 17 00:00:00 2001 From: Kornelius Kalnbach Date: Sun, 24 Nov 2019 16:37:06 +0100 Subject: fix tests for Ruby 2.3 --- rake_tasks/test.rake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rake_tasks/test.rake b/rake_tasks/test.rake index 277bd33..51239fb 100644 --- a/rake_tasks/test.rake +++ b/rake_tasks/test.rake @@ -79,7 +79,9 @@ Please rename or remove it and run again to use the GitHub repository: end end -require 'rspec/core/rake_task' -RSpec::Core::RakeTask.new(:spec) +unless RUBY_VERSION[/^2.3/] + require 'rspec/core/rake_task' + RSpec::Core::RakeTask.new(:spec) +end task :test => %w(test:functional test:units test:exe spec) -- cgit v1.2.1 From 70ea6b742137f97efd1ce02f0e16599cd1258f58 Mon Sep 17 00:00:00 2001 From: Kornelius Kalnbach Date: Sun, 24 Nov 2019 16:37:31 +0100 Subject: actually, we only need to disable SimpleCov --- rake_tasks/test.rake | 6 ++---- spec/spec_helper.rb | 6 ++++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rake_tasks/test.rake b/rake_tasks/test.rake index 51239fb..277bd33 100644 --- a/rake_tasks/test.rake +++ b/rake_tasks/test.rake @@ -79,9 +79,7 @@ Please rename or remove it and run again to use the GitHub repository: end end -unless RUBY_VERSION[/^2.3/] - require 'rspec/core/rake_task' - RSpec::Core::RakeTask.new(:spec) -end +require 'rspec/core/rake_task' +RSpec::Core::RakeTask.new(:spec) task :test => %w(test:functional test:units test:exe spec) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 66f4127..78a60b2 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,5 +1,7 @@ -require 'simplecov' -SimpleCov.start +unless RUBY_VERSION[/^2.3/] + require 'simplecov' + SimpleCov.start +end # This file was generated by the `rspec --init` command. Conventionally, all # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`. -- cgit v1.2.1 From a5fe57486659b79a006d97489dbe2b4637543658 Mon Sep 17 00:00:00 2001 From: Kornelius Kalnbach Date: Sun, 24 Nov 2019 16:39:15 +0100 Subject: also disable for Ruby 1.8.7 --- spec/spec_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 78a60b2..282f576 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,4 +1,4 @@ -unless RUBY_VERSION[/^2.3/] +if RUBY_VERSION >= '1.9' && !RUBY_VERSION[/^2.3/] require 'simplecov' SimpleCov.start end -- cgit v1.2.1 From a24c39336d85e3d41b709dac1ae1f0ae1cd2f658 Mon Sep 17 00:00:00 2001 From: Kornelius Kalnbach Date: Sun, 24 Nov 2019 16:41:38 +0100 Subject: also test with 2.7.0-preview3 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 19932b4..cc067ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ rvm: - 2.4 - 2.5 - 2.6 + - 2.7.0-preview3 - ruby-head - jruby matrix: -- cgit v1.2.1 From 951ea4fab6f9c8a984bd87d5abf77a84322bf011 Mon Sep 17 00:00:00 2001 From: Kornelius Kalnbach Date: Sun, 24 Nov 2019 16:43:11 +0100 Subject: reorder gems --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 0369afe..559648a 100644 --- a/Gemfile +++ b/Gemfile @@ -12,8 +12,8 @@ group :development do gem 'rdoc', Gem::Version.new(RUBY_VERSION) < Gem::Version.new('1.9.3') ? '~> 4.2.2' : Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2.2') ? '< 6' : '>= 6' gem 'RedCloth', RUBY_PLATFORM == 'java' ? '= 4.2.9' : '>= 4.0.3' gem 'rspec', '~> 3.9.0' - gem 'simplecov', '~> 0.17.1' gem 'shoulda-context', RUBY_VERSION < '1.9' ? '= 1.2.1' : '>= 1.2.1' + gem 'simplecov', '~> 0.17.1' gem 'term-ansicolor', RUBY_VERSION < '2.0' ? '~> 1.3.2' : '>= 1.3.2' gem 'test-unit', RUBY_VERSION < '1.9' ? '~> 2.0' : '>= 3.0' gem 'tins', RUBY_VERSION < '2.0' ? '~> 1.6.0' : '>= 1.6.0' -- cgit v1.2.1 From e18aa32071f4ca83a622c9ed600b1cf4145edc06 Mon Sep 17 00:00:00 2001 From: Kornelius Kalnbach Date: Sun, 24 Nov 2019 16:52:50 +0100 Subject: maybe like this? --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cc067ac..a8f407e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ rvm: - 2.4 - 2.5 - 2.6 - - 2.7.0-preview3 + - 2.7 - ruby-head - jruby matrix: -- cgit v1.2.1 From f3b1f3dc9dbf1145e3244c1cc6d81438c180ea29 Mon Sep 17 00:00:00 2001 From: Kornelius Kalnbach Date: Sun, 24 Nov 2019 16:54:03 +0100 Subject: disable specs for Ruby 1.8.7 --- rake_tasks/test.rake | 6 ++++-- spec/spec_helper.rb | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/rake_tasks/test.rake b/rake_tasks/test.rake index 277bd33..e72c96b 100644 --- a/rake_tasks/test.rake +++ b/rake_tasks/test.rake @@ -79,7 +79,9 @@ Please rename or remove it and run again to use the GitHub repository: end end -require 'rspec/core/rake_task' -RSpec::Core::RakeTask.new(:spec) +if RUBY_VERSION >= '1.9' + require 'rspec/core/rake_task' + RSpec::Core::RakeTask.new(:spec) +end task :test => %w(test:functional test:units test:exe spec) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 282f576..78a60b2 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,4 +1,4 @@ -if RUBY_VERSION >= '1.9' && !RUBY_VERSION[/^2.3/] +unless RUBY_VERSION[/^2.3/] require 'simplecov' SimpleCov.start end -- cgit v1.2.1 From e0b08d754b205f9204415c8d08b93a30cb92c04b Mon Sep 17 00:00:00 2001 From: Kornelius Kalnbach Date: Sun, 24 Nov 2019 17:01:34 +0100 Subject: add simple spec for CodeRay.scan --- spec/coderay_spec.rb | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/spec/coderay_spec.rb b/spec/coderay_spec.rb index 8a299b3..88c9aec 100644 --- a/spec/coderay_spec.rb +++ b/spec/coderay_spec.rb @@ -13,4 +13,23 @@ RSpec.describe CodeRay do expect(CodeRay.coderay_path('file')).to eq("#{base}/lib/coderay/file") end end + + describe '.scan' do + let(:code) { 'puts "Hello, World!"' } + let(:tokens) do + [ + ['puts', :ident], + [' ', :space], + [:begin_group, :string], + ['"', :delimiter], + ['Hello, World!', :content], + ['"', :delimiter], + [:end_group, :string] + ].flatten + end + + it 'returns tokens' do + expect(CodeRay.scan(code, :ruby).tokens).to eq(tokens) + end + end end -- cgit v1.2.1