drop Ruby 1.8, add some extra tests
This commit is contained in:
parent
9a2c1533e3
commit
ca4935361b
|
@ -1,5 +1,4 @@
|
||||||
rvm:
|
rvm:
|
||||||
- 1.8.7
|
|
||||||
- 1.9.3
|
- 1.9.3
|
||||||
- 2.0.0
|
- 2.0.0
|
||||||
- jruby-19mode
|
- jruby-19mode
|
||||||
|
|
12
Gemfile
12
Gemfile
|
@ -19,17 +19,11 @@ gem "liquid", :require => false
|
||||||
gem "less", "~> 2.3.0", :require => false
|
gem "less", "~> 2.3.0", :require => false
|
||||||
gem "stylus", :require => false
|
gem "stylus", :require => false
|
||||||
|
|
||||||
# gem "pry", :require => false
|
|
||||||
# gem "pry-debugger", :require => false
|
|
||||||
|
|
||||||
platforms :ruby do
|
platforms :ruby do
|
||||||
gem "therubyracer"
|
gem "therubyracer"
|
||||||
gem "redcarpet", /^1\.8/.match(RUBY_VERSION) ? "~> 2.0" : "~> 3.0"
|
gem "redcarpet", "~> 3.0"
|
||||||
end
|
gem "pry", :require => false
|
||||||
|
gem "pry-debugger", :require => false
|
||||||
# Cross-templating language block fix for Ruby 1.8
|
|
||||||
platforms :mri_18 do
|
|
||||||
gem "ruby18_source_location"
|
|
||||||
end
|
end
|
||||||
|
|
||||||
platforms :jruby do
|
platforms :jruby do
|
||||||
|
|
|
@ -19,7 +19,6 @@ require 'cucumber/rake/task'
|
||||||
Cucumber::Rake::Task.new do |t|
|
Cucumber::Rake::Task.new do |t|
|
||||||
exempt_tags = ["--tags ~@wip"]
|
exempt_tags = ["--tags ~@wip"]
|
||||||
exempt_tags << "--tags ~@nojava" if RUBY_PLATFORM == "java"
|
exempt_tags << "--tags ~@nojava" if RUBY_PLATFORM == "java"
|
||||||
exempt_tags << "--tags ~@no18" if RUBY_VERSION < "1.9"
|
|
||||||
exempt_tags << "--tags ~@encoding" unless Object.const_defined?(:Encoding)
|
exempt_tags << "--tags ~@encoding" unless Object.const_defined?(:Encoding)
|
||||||
exempt_tags << "--tags ~@travishatesme" if ENV["TRAVIS"] == "true"
|
exempt_tags << "--tags ~@travishatesme" if ENV["TRAVIS"] == "true"
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
Feature: Markdown (Kramdown) support
|
Feature: Markdown (Kramdown) support
|
||||||
In order to test included Kramdown support
|
In order to test included Kramdown support
|
||||||
|
|
||||||
@no18
|
|
||||||
Scenario: Kramdown smartypants extension
|
Scenario: Kramdown smartypants extension
|
||||||
Given a fixture app "markdown-app"
|
Given a fixture app "markdown-app"
|
||||||
And a file named "config.rb" with:
|
And a file named "config.rb" with:
|
||||||
|
|
|
@ -34,8 +34,9 @@ Feature: Markdown (Redcarpet) support
|
||||||
Then I should see "<sup>"
|
Then I should see "<sup>"
|
||||||
When I go to "/lax_spacing.html"
|
When I go to "/lax_spacing.html"
|
||||||
Then I should see "<p>hello</p>"
|
Then I should see "<p>hello</p>"
|
||||||
|
When I go to "/mailto.html"
|
||||||
|
Then I should see '<h1>✉ <a href="mailto:mail@mail.com">Mail</a></h1>'
|
||||||
|
|
||||||
@no18
|
|
||||||
Scenario: Redcarpet 3 extensions
|
Scenario: Redcarpet 3 extensions
|
||||||
Given a fixture app "markdown-app"
|
Given a fixture app "markdown-app"
|
||||||
And a file named "config.rb" with:
|
And a file named "config.rb" with:
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
# ✉ [Mail](mailto:mail@mail.com)
|
|
@ -0,0 +1 @@
|
||||||
|
<%= page_classes %>
|
|
@ -0,0 +1 @@
|
||||||
|
<%= page_classes %>
|
|
@ -0,0 +1 @@
|
||||||
|
<%= page_classes :numeric_prefix => "haaaaay" %>
|
|
@ -3,9 +3,4 @@ source 'https://rubygems.org'
|
||||||
gem "middleman", "~><%= Middleman::VERSION %>"
|
gem "middleman", "~><%= Middleman::VERSION %>"
|
||||||
|
|
||||||
# For faster file watcher updates on Windows:
|
# For faster file watcher updates on Windows:
|
||||||
gem "wdm", "~> 0.1.0", :platforms => [:mswin, :mingw]
|
gem "wdm", "~> 0.1.0", :platforms => [:mswin, :mingw]
|
||||||
|
|
||||||
# Cross-templating language block fix for Ruby 1.8
|
|
||||||
platforms :mri_18 do
|
|
||||||
gem "ruby18_source_location"
|
|
||||||
end
|
|
|
@ -8,9 +8,4 @@ gem "middleman", "~><%= Middleman::VERSION %>"
|
||||||
gem "middleman-livereload", "~> 3.1.0"
|
gem "middleman-livereload", "~> 3.1.0"
|
||||||
|
|
||||||
# For faster file watcher updates on Windows:
|
# For faster file watcher updates on Windows:
|
||||||
gem "wdm", "~> 0.1.0", :platforms => [:mswin, :mingw]
|
gem "wdm", "~> 0.1.0", :platforms => [:mswin, :mingw]
|
||||||
|
|
||||||
# Cross-templating language block fix for Ruby 1.8
|
|
||||||
platforms :mri_18 do
|
|
||||||
gem "ruby18_source_location"
|
|
||||||
end
|
|
|
@ -1,14 +1,3 @@
|
||||||
# Required to hack around Padrino blocks within different template types.
|
|
||||||
require 'rbconfig'
|
|
||||||
if RUBY_VERSION =~ /1.8/ && RbConfig::CONFIG['ruby_install_name'] == 'ruby'
|
|
||||||
begin
|
|
||||||
require 'ruby18_source_location'
|
|
||||||
rescue LoadError
|
|
||||||
$stderr.puts "Ruby 1.8 requires the 'ruby18_source_location' gem be added to your Gemfile"
|
|
||||||
exit(1)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
if !defined?(::Padrino::Helpers)
|
if !defined?(::Padrino::Helpers)
|
||||||
require 'vendored-middleman-deps/padrino-core-0.11.2/lib/padrino-core/support_lite'
|
require 'vendored-middleman-deps/padrino-core-0.11.2/lib/padrino-core/support_lite'
|
||||||
require 'vendored-middleman-deps/padrino-helpers-0.11.2/lib/padrino-helpers'
|
require 'vendored-middleman-deps/padrino-helpers-0.11.2/lib/padrino-helpers'
|
||||||
|
|
Loading…
Reference in a new issue