unit test fixes

- my tests were barking about the wkb having the wrong srid. using json works.

Author: jkraemer

test/test_helper.rb

@@ -3,11 +3,16 @@
 
 class GttTest < ActiveSupport::TestCase
 
+  def test_geojson
+    {'type'=>'Feature','geometry'=>{ 'type'=>'Polygon','coordinates'=> [[[135.22073422241215,34.70569060003112],[135.30227337646488,34.6990600142143],[135.3000417785645,34.670969984370885],[135.25283489990238,34.676052303889435],[135.1942125396729,34.67668404351015],[135.22073422241215,34.70569060003112]]]}}.to_json
+  end
+
   def test_geom
     RedmineGtt::Conversions::WkbToGeom.("01030000000100000006000000C84B374110E76040381DD011545A4140C84B3739ACE96040F07E6DCC7A594140C84B37F199E960403CBC2D58E2554140C84B373917E8604098CBC3E188564140C84B37FD36E66040F24C2E959D564140C84B374110E76040381DD011545A4140")
   end
 
   def assert_geojson(json)
+    json = JSON.parse json if json.is_a?(String)
     assert_equal 'Feature', json['type']
     assert geom = json['geometry']
     assert_equal 'Polygon', geom['type']

test/unit/gtt_map_test.rb

@@ -6,7 +6,7 @@ class GttMapTest < GttTest
     @ts = GttTileSource.create! name: 'test', type: 'ol.source.OSM'
   end
 
-  test 'should compute json from wkb' do
+  test 'should compute json from geom' do
     m = GttMap.new layers: [@ts], geom: test_geom
     assert_geojson m.json
   end

test/unit/issue_test.rb

@@ -6,7 +6,12 @@ class IssueTest < GttTest
   setup do
     @project = Project.find 'ecookbook'
     @issue = @project.issues.last
-    @issue.update_column :geom, test_geom
+    @issue.update_attribute :geojson, test_geojson
+    @issue = Issue.find @issue.id
+  end
+
+  test 'should have geom attribute' do
+    assert @issue.geom.present?
   end
 
   test 'should have geojson attribute' do

test/unit/project_test.rb

@@ -3,27 +3,27 @@
 class ProjectTest < GttTest
   fixtures :projects
 
-  test 'should have geojson attribute' do
-    p = Project.find 'ecookbook'
-    p.update_column :geom, test_geom
+  setup do
+    @p = Project.find 'ecookbook'
+    @p.update_attribute :geojson, test_geojson
+  end
 
-    assert_geojson p.geojson
+  test 'should have geojson and geom attribute' do
+    assert @p.geom.present?
+    assert_geojson @p.geojson
   end
 
   test 'should render properties in as_geojson' do
-    p = Project.find 'ecookbook'
-    p.update_column :geom, test_geom
-
-    j = p.as_geojson include_properties: true
+    j = @p.as_geojson include_properties: true
     assert_geojson j
-    assert_equal p.id, j['properties']['id']
-    assert_equal p.identifier, j['properties']['identifier']
-    assert_equal p.name, j['properties']['name']
+    assert_equal @p.id, j['properties']['id']
+    assert_equal @p.identifier, j['properties']['identifier']
+    assert_equal @p.name, j['properties']['name']
 
-    j = p.as_geojson include_properties: { only: [:id, :identifier] }
+    j = @p.as_geojson include_properties: { only: [:id, :identifier] }
     assert_geojson j
-    assert_equal p.id, j['properties']['id']
-    assert_equal p.identifier, j['properties']['identifier']
+    assert_equal @p.id, j['properties']['id']
+    assert_equal @p.identifier, j['properties']['identifier']
     assert_nil j['properties']['name']
   end
 

test/unit/user_test.rb

@@ -5,7 +5,11 @@ class UserTest < GttTest
 
   setup do
     @user = User.find_by_login 'dlopper'
-    @user.update_column :geom, test_geom
+    @user.update_attribute :geojson, test_geojson
+  end
+
+  test 'should set geom from json' do
+    assert @user.geom.present?
   end
 
   test 'should have geojson attribute' do