Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #13 from gwolf/master

Small patches to allow the tests to pass
  • Loading branch information...
commit 9af0d75a99e074647b0ad93e5f28b3317269de0d 2 parents 79c4e2d + f5367da
Geoffrey Grosenbach authored
Showing with 3 additions and 2 deletions.
  1. +1 −1  lib/gruff/scene.rb
  2. +1 −0  test/test_line.rb
  3. +1 −1  test/test_scene.rb
2  lib/gruff/scene.rb
View
@@ -133,7 +133,7 @@ class Gruff::Layer
def initialize(base_dir, folder_name)
@base_dir = base_dir.to_s
@name = folder_name.to_s
- @filenames = Dir.open(File.join(base_dir, folder_name)).entries.select { |file| file =~ /^[^.]+\.png$/ }
+ @filenames = Dir.open(File.join(base_dir, folder_name)).entries.select { |file| file =~ /^[^.]+\.png$/ }.sort
@selected_filename = select_default
end
1  test/test_line.rb
View
@@ -462,6 +462,7 @@ def test_jruby_error
g.legend_font_size = 12
g.marker_font_size = 16
g.hide_dots = false
+ g.label_max_decimals = 1
g.write('test/output/line_jruby_error.png')
end
2  test/test_scene.rb
View
@@ -51,7 +51,7 @@ def test_stormy_day
def test_layer
l = LayerStub.new(File.expand_path("../assets/city_scene", File.dirname(__FILE__)), "clouds")
- assert_equal %w(cloudy.png partly_cloudy.png stormy.png), l.filenames
+ assert_equal %w(cloudy.png partly_cloudy.png stormy.png), l.filenames.sort
l = LayerStub.new(File.expand_path("../assets/city_scene", File.dirname(__FILE__)), "grass")
assert_equal 'default.png', l.selected_filename
Please sign in to comment.
Something went wrong with that request. Please try again.