Remove test fixtures.

diff --git a/test/fixtures/changesets.yml b/test/fixtures/changesets.yml
deleted file mode 100644 (file)
index 2d5ce4e..0000000
--- a/test/fixtures/changesets.yml
+++ /dev/null
@@ -1,84 +0,0 @@
-# FIXME! all of these changesets need their bounding boxes set correctly!
-#
-<% SCALE = 10000000 unless defined?(SCALE) %>
-
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-normal_user_first_change:
-  id: 1
-  user_id: 1
-  created_at: "2007-01-01 00:00:00"
-  closed_at: <%= Time.now.utc + 86400 %>
-  min_lon: <%= 1 * SCALE %>
-  min_lat: <%= 1 * SCALE %>
-  max_lon: <%= 5 * SCALE %>
-  max_lat: <%= 5 * SCALE %>
-  num_changes: 11
-
-public_user_first_change:
-  id: 2
-  user_id: 2
-  created_at: <%= Time.now.utc %>
-  closed_at: <%= Time.now.utc + 86400 %>
-  num_changes: 0
-
-deleted_user_first_change:
-  id: 9
-  user_id: 11
-  created_at: "2007-01-01 00:00:00"
-  closed_at: "2007-01-02 00:00:00"
-  num_changes: 0
-
-normal_user_closed_change:
-  id: 3
-  user_id: 1
-  created_at: "2007-01-01 00:00:00"
-  closed_at: "2007-01-02 00:00:00"
-  num_changes: 0
-
-public_user_closed_change:
-  id: 7
-  user_id: 2
-  created_at: "2007-01-01 00:00:00"
-  closed_at: "2007-01-02 00:00:00"
-  num_changes: 0
-
-public_user_version_change:
-  id: 4
-  user_id: 2
-  created_at: <%= Time.now.utc %>
-  closed_at: <%= Time.now.utc + 86400 %>
-  min_lon: <%= 1 * SCALE %>
-  min_lat: <%= 1 * SCALE %>
-  max_lon: <%= 4 * SCALE %>
-  max_lat: <%= 4 * SCALE %>
-  num_changes: 8
-
-# changeset to contain all the invalid stuff that is in the
-# fixtures (nodes outside the world, etc...), but needs to have
-# a valid user...
-invalid_changeset:
-  id: 5
-  user_id: 3
-  created_at: "2008-01-01 00:00:00"
-  closed_at: "2008-01-02 00:00:00"
-  num_changes: 9
-
-# changeset which still has time remaining, but has been closed
-# by containing too many elements.
-too_many_elements_changeset:
-  id: 6
-  user_id: 1
-  created_at: "2008-01-01 00:00:00"
-  closed_at: <%= Time.now.utc + 86400 %>
-  min_lon: <%= 1 * SCALE %>
-  min_lat: <%= 1 * SCALE %>
-  max_lon: <%= 4 * SCALE %>
-  max_lat: <%= 4 * SCALE %>
-  num_changes: <%= Changeset::MAX_ELEMENTS + 1 %>
-
-normal_user_subscribed_change:
-  id: 8
-  user_id: 1
-  created_at: "2007-01-01 00:00:00"
-  closed_at: "2007-01-02 00:00:00"
-  num_changes: 0

diff --git a/test/fixtures/current_nodes.yml b/test/fixtures/current_nodes.yml
deleted file mode 100644 (file)
index 8389f67..0000000
--- a/test/fixtures/current_nodes.yml
+++ /dev/null
@@ -1,192 +0,0 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-<% SCALE = 10000000 unless defined?(SCALE) %>
-
-visible_node:
-  id: 1
-  latitude: <%= 1*SCALE %>
-  longitude: <%= 1*SCALE %>
-  changeset_id: 1
-  visible: true
-  version: 1
-  tile: <%= QuadTile.tile_for_point(1,1) %>
-  timestamp: 2007-01-01 00:00:00
-
-invisible_node:
-  id: 2
-  latitude: <%= 2*SCALE %>
-  longitude: <%= 2*SCALE %>
-  changeset_id: 1
-  visible: false
-  version: 1
-  tile: <%= QuadTile.tile_for_point(2,2) %>
-  timestamp: 2007-01-01 00:00:00
-
-used_node_1:
-  id: 3
-  latitude: <%= 3*SCALE %>
-  longitude: <%= 3*SCALE %>
-  changeset_id: 2
-  visible: true
-  version: 1
-  tile: <%= QuadTile.tile_for_point(3,3) %>
-  timestamp: 2007-01-01 00:00:00
-
-used_node_2:
-  id: 4
-  latitude: <%= 4*SCALE %>
-  longitude: <%= 4*SCALE %>
-  changeset_id: 1
-  visible: true
-  version: 1
-  tile: <%= QuadTile.tile_for_point(4,4) %>
-  timestamp: 2007-01-01 00:00:00
-
-node_used_by_relationship:
-  id: 5
-  latitude: <%= 5*SCALE %>
-  longitude: <%= 5*SCALE %>
-  changeset_id: 2
-  visible: true
-  version: 1
-  tile: <%= QuadTile.tile_for_point(5,5) %>
-  timestamp: 2007-01-01 00:00:00
-  
-node_too_far_north:
-  id: 6
-  latitude: <%= 90.01*SCALE %>
-  longitude: <%= 6*SCALE %>
-  changeset_id: 5
-  visible: true
-  version: 1
-  tile: <%= QuadTile.tile_for_point(90.01,6) %>
-  timestamp: 2007-01-01 00:00:00
-  
-node_north_limit:
-  id: 11
-  latitude: <%= 90*SCALE %>
-  longitude: <%= 11*SCALE %>
-  changeset_id: 5
-  visible: true
-  version: 1
-  tile: <%= QuadTile.tile_for_point(90,11) %>
-  timestamp: 2008-07-08 14:50:00
-  
-node_too_far_south:
-  id: 7
-  latitude: <%= -90.01*SCALE %>
-  longitude: <%= 7*SCALE %>
-  changeset_id: 5
-  visible: true
-  version: 1
-  tile: <%= QuadTile.tile_for_point(-90.01,7) %>
-  timestamp: 2007-01-01 00:00:00
-  
-node_south_limit:
-  id: 12
-  latitude: <%= -90*SCALE %>
-  longitude: <%= 12*SCALE %>
-  changeset_id: 5
-  visible: true
-  version: 1
-  tile: <%= QuadTile.tile_for_point(-90,12) %>
-  timestamp: 2008-07-08 15:02:18
-  
-node_too_far_west:
-  id: 8
-  latitude: <%= 8*SCALE %>
-  longitude: <%= -180.01*SCALE %>
-  changeset_id: 5
-  visible: true
-  version: 1
-  tile: <%= QuadTile.tile_for_point(8,-180.01) %>
-  timestamp: 2007-01-01 00:00:00
-  
-node_west_limit:
-  id: 13
-  latitude: <%= 13*SCALE %>
-  longitude: <%= -180*SCALE %>
-  changeset_id: 5
-  visible: true
-  version: 1
-  tile: <%= QuadTile.tile_for_point(13,-180) %>
-  timestamp: 2008-07-08 15:17:37
-  
-node_too_far_east:
-  id: 9
-  latitude: <%= 9*SCALE %>
-  longitude: <%= 180.01*SCALE %>
-  changeset_id: 5
-  visible: true
-  version: 1
-  tile: <%= QuadTile.tile_for_point(9,180.01) %>
-  timestamp: 2007-01-01 00:00:00
-  
-node_east_limit:
-  id: 14
-  latitude: <%= 14*SCALE %>
-  longitude: <%= 180*SCALE %>
-  changeset_id: 5
-  visible: true
-  version: 1
-  tile: <%= QuadTile.tile_for_point(14,180) %>
-  timestamp: 2008-07-08 15:46:16
-  
-node_totally_wrong:
-  id: 10
-  latitude: <%= 200*SCALE %>
-  longitude: <%= 200*SCALE %>
-  changeset_id: 5
-  visible: true
-  version: 1
-  tile: <%= QuadTile.tile_for_point(200,200) %>
-  timestamp: 2007-01-01 00:00:00
-  
-node_with_versions:
-  id: 15
-  latitude: <%= 1*SCALE %>
-  longitude: <%= 1*SCALE %>
-  changeset_id: 4
-  visible: true
-  version: 4
-  tile: <%= QuadTile.tile_for_point(1,1) %>
-  timestamp: 2008-01-01 00:04:00
-  
-public_visible_node:
-  id: 16
-  latitude: <%= 1*SCALE %>
-  longitude: <%= 1*SCALE %>
-  changeset_id: 2
-  visible: true
-  version: 1
-  tile: <%= QuadTile.tile_for_point(1,1) %>
-  timestamp: 2007-01-01 00:00:00
-
-redacted_node:
-  id: 17
-  latitude: <%= 1*SCALE %>
-  longitude: <%= 1*SCALE %>
-  changeset_id: 2
-  visible: false
-  version: 2
-  tile: <%= QuadTile.tile_for_point(1,1) %>
-  timestamp: 2007-01-01 00:00:00
-
-node_with_name:
-  id: 18
-  latitude: <%= 1*SCALE %>
-  longitude: <%= 1*SCALE %>
-  changeset_id: 2
-  visible: true
-  version: 2
-  tile: <%= QuadTile.tile_for_point(1,1) %>
-  timestamp: 2007-01-01 00:00:00
-
-node_with_ref_without_name:
-  id: 19
-  latitude: <%= 1*SCALE %>
-  longitude: <%= 1*SCALE %>
-  changeset_id: 2
-  visible: true
-  version: 1
-  tile: <%= QuadTile.tile_for_point(1,1) %>
-  timestamp: 2007-01-01 00:00:00

diff --git a/test/fixtures/current_relation_members.yml b/test/fixtures/current_relation_members.yml
deleted file mode 100644 (file)
index 67911b8..0000000
--- a/test/fixtures/current_relation_members.yml
+++ /dev/null
@@ -1,61 +0,0 @@
-t1:
-  relation_id: 1
-  sequence_id: 1
-  member_role: "some"
-  member_type: "Way"
-  member_id: 3
-
-t2:
-  relation_id: 1
-  sequence_id: 2
-  member_role: "some"
-  member_type: "Node"
-  member_id: 5
-
-t3:
-  relation_id: 1
-  sequence_id: 3
-  member_role: "some"
-  member_type: "Relation"
-  member_id: 3
-
-t4:
-  relation_id: 3
-  sequence_id: 1
-  member_role: "some"
-  member_type: "Node"
-  member_id: 5
-
-t5:
-  relation_id: 2
-  sequence_id: 1
-  member_role: "some"
-  member_type: "Node"
-  member_id: 5
-  
-public_used:
-  relation_id: 6
-  member_role: "used by other relation"
-  member_type: "Relation"
-  member_id: 5
-
-r8_m1:
-  relation_id: 8
-  sequence_id: 1
-  member_role: "some node"
-  member_type: "Node"
-  member_id: 15
-
-r8_m2:
-  relation_id: 8
-  sequence_id: 2
-  member_role: "some way"
-  member_type: "Way"
-  member_id: 4
-
-r8_m3:
-  relation_id: 8
-  sequence_id: 3
-  member_role: "some relation"
-  member_type: "Relation"
-  member_id: 7

diff --git a/test/fixtures/current_relations.yml b/test/fixtures/current_relations.yml
deleted file mode 100644 (file)
index fd95f60..0000000
--- a/test/fixtures/current_relations.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-visible_relation:
-  id: 1
-  changeset_id: 1
-  timestamp: 2007-01-01 00:00:00
-  visible: true
-  version: 1
-
-invisible_relation:
-  id: 2
-  changeset_id: 3
-  timestamp: 2007-01-01 00:00:00
-  visible: false
-  version: 1
-
-used_relation:
-  id: 3
-  changeset_id: 1
-  timestamp: 2007-01-01 00:00:00
-  visible: true
-  version: 1
-  
-multi_tag_relation:
-  id: 4
-  changeset_id: 4
-  timestamp: 2009-04-21 09:50:57
-  visible: true
-  version: 1
-  
-public_used_relation:
-  id: 5
-  changeset_id: 2
-  timestamp: 2009-04-22 00:30:33
-  visible: true
-  version: 1
-  
-public_visible_relation:
-  id: 6
-  changeset_id: 2
-  timestamp: 2009-04-22 00:34:12
-  visible: true
-  version: 1
-
-relation_with_redacted_versions:
-  id: 7
-  changeset_id: 4
-  timestamp: 2008-01-01 00:04:13
-  visible: true
-  version: 4
-
-relation_with_versions:
-  id: 8
-  changeset_id: 4
-  timestamp: 2008-01-01 00:04:00
-  visible: true
-  version: 4

diff --git a/test/fixtures/current_way_nodes.yml b/test/fixtures/current_way_nodes.yml
deleted file mode 100644 (file)
index fa7fb32..0000000
--- a/test/fixtures/current_way_nodes.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-t1:
-  way_id: 1
-  node_id: 3
-  sequence_id: 1
-
-t2:
-  way_id: 2
-  node_id: 3
-  sequence_id: 1
-
-t3:
-  way_id: 3
-  node_id: 3
-  sequence_id: 1
-
-t4:
-  way_id: 4
-  node_id: 15
-  sequence_id: 1
-
-w5_n1:
-  way_id: 5
-  node_id: 4
-  sequence_id: 1
-
-w5_n2:
-  way_id: 5
-  node_id: 4
-  sequence_id: 2
-
-w7_n1:
-  way_id: 7
-  node_id: 4
-  sequence_id: 1
-
-w7_n2:
-  way_id: 7
-  node_id: 15
-  sequence_id: 2
-
-w7_n3:
-  way_id: 7
-  node_id: 11
-  sequence_id: 3

diff --git a/test/fixtures/current_ways.yml b/test/fixtures/current_ways.yml
deleted file mode 100644 (file)
index e6e5d84..0000000
--- a/test/fixtures/current_ways.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-visible_way:
-  id: 1
-  changeset_id: 2
-  timestamp: 2007-01-01 00:00:00
-  visible: true
-  version: 1
-
-invisible_way:
-  id: 2
-  changeset_id: 2
-  timestamp: 2007-01-01 00:00:00
-  visible: false
-  version: 1
-
-used_way:
-  id: 3
-  changeset_id: 2
-  timestamp: 2007-01-01 00:00:00
-  visible: true
-  version: 1
-
-way_with_versions:
-  id: 4
-  changeset_id: 4
-  timestamp: 2008-01-01 00:04:00
-  visible: true
-  version: 4
-
-way_with_duplicate_nodes:
-  id: 5
-  changeset_id: 2
-  timestamp: 2007-01-01 00:00:00
-  visible: true
-  version: 1
-
-way_with_redacted_versions:
-  id: 6
-  changeset_id: 4
-  timestamp: 2008-01-01 00:04:13
-  visible: true
-  version: 4
-
-way_with_multiple_nodes:
-  id: 7
-  changeset_id: 4
-  timestamp: 2008-01-01 00:00:00
-  visible: true
-  version: 2

diff --git a/test/fixtures/nodes.yml b/test/fixtures/nodes.yml
deleted file mode 100644 (file)
index 7841c6e..0000000
--- a/test/fixtures/nodes.yml
+++ /dev/null
@@ -1,234 +0,0 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-<% SCALE = 10000000 unless defined?(SCALE) %>
-
-visible_node:
-  node_id: 1
-  latitude: <%= 1*SCALE %>
-  longitude: <%= 1*SCALE %>
-  changeset_id: 1
-  visible: true
-  version: 1
-  tile: <%= QuadTile.tile_for_point(1,1) %>
-  timestamp: 2007-01-01 00:00:00
-
-invisible_node:
-  node_id: 2
-  latitude: <%= 2*SCALE %>
-  longitude: <%= 2*SCALE %>
-  changeset_id: 1
-  visible: false
-  version: 1
-  tile: <%= QuadTile.tile_for_point(2,2) %>
-  timestamp: 2007-01-01 00:00:00
-
-used_node_1:
-  node_id: 3
-  latitude: <%= 3*SCALE %>
-  longitude: <%= 3*SCALE %>
-  changeset_id: 2
-  visible: true
-  version: 1
-  tile: <%= QuadTile.tile_for_point(3,3) %>
-  timestamp: 2007-01-01 00:00:00
-
-used_node_2:
-  node_id: 4
-  latitude: <%= 4*SCALE %>
-  longitude: <%= 4*SCALE %>
-  changeset_id: 1
-  visible: true
-  version: 1
-  tile: <%= QuadTile.tile_for_point(4,4) %>
-  timestamp: 2007-01-01 00:00:00
-
-node_used_by_relationship:
-  node_id: 5
-  latitude: <%= 5*SCALE %>
-  longitude: <%= 5*SCALE %>
-  changeset_id: 2
-  visible: true
-  version: 1
-  tile: <%= QuadTile.tile_for_point(5,5) %>
-  timestamp: 2007-01-01 00:00:00
-
-node_too_far_north:
-  node_id: 6
-  latitude: <%= 90.01*SCALE %>
-  longitude: <%= 6*SCALE %>
-  changeset_id: 5
-  visible: true
-  version: 1
-  tile: <%= QuadTile.tile_for_point(90.01,6) %>
-  timestamp: 2007-01-01 00:00:00
-  
-node_north_limit:
-  node_id: 11
-  latitude: <%= 90*SCALE %>
-  longitude: <%= 11*SCALE %>
-  changeset_id: 5
-  visible: true
-  version: 1
-  tile: <%= QuadTile.tile_for_point(90,11) %>
-  timestamp: 2008-07-08 14:50:00
-  
-node_too_far_south:
-  node_id: 7
-  latitude: <%= -90.01*SCALE %>
-  longitude: <%= 7*SCALE %>
-  changeset_id: 5
-  visible: true
-  version: 1
-  tile: <%= QuadTile.tile_for_point(-90.01,7) %>
-  timestamp: 2007-01-01 00:00:00
-  
-node_south_limit:
-  node_id: 12
-  latitude: <%= -90*SCALE %>
-  longitude: <%= 12*SCALE %>
-  changeset_id: 5
-  visible: true
-  version: 1
-  tile: <%= QuadTile.tile_for_point(-90,12) %>
-  timestamp: 2008-07-08 15:02:18
-  
-node_too_far_west:
-  node_id: 8
-  latitude: <%= 8*SCALE %>
-  longitude: <%= -180.01*SCALE %>
-  changeset_id: 5
-  visible: true
-  version: 1
-  tile: <%= QuadTile.tile_for_point(8,-180.01) %>
-  timestamp: 2007-01-01 00:00:00
-  
-node_west_limit:
-  node_id: 13
-  latitude: <%= 13*SCALE %>
-  longitude: <%= -180*SCALE %>
-  changeset_id: 5
-  visible: true
-  version: 1
-  tile: <%= QuadTile.tile_for_point(13,-180) %>
-  timestamp: 2008-07-08 15:17:37
-  
-node_too_far_east:
-  node_id: 9
-  latitude: <%= 9*SCALE %>
-  longitude: <%= 180.01*SCALE %>
-  changeset_id: 5
-  visible: true
-  version: 1
-  tile: <%= QuadTile.tile_for_point(9,180.01) %>
-  timestamp: 2007-01-01 00:00:00
-  
-node_east_limit:
-  node_id: 14
-  latitude: <%= 14*SCALE %>
-  longitude: <%= 180*SCALE %>
-  changeset_id: 5
-  visible: true
-  version: 1
-  tile: <%= QuadTile.tile_for_point(14,180) %>
-  timestamp: 2008-07-08 15:46:16
-
-node_totally_wrong:
-  node_id: 10
-  latitude: <%= 200*SCALE %>
-  longitude: <%= 200*SCALE %>
-  changeset_id: 5
-  visible: true
-  version: 1
-  tile: <%= QuadTile.tile_for_point(200,200) %>
-  timestamp: 2007-01-01 00:00:00
-  
-node_with_versions_v1:
-  node_id: 15
-  latitude: <%= 1*SCALE %>
-  longitude: <%= 1*SCALE %>
-  changeset_id: 4
-  visible: true
-  version: 1
-  tile: <%= QuadTile.tile_for_point(1,1) %>
-  timestamp: 2008-01-01 00:01:00
-
-node_with_versions_v2:
-  node_id: 15
-  latitude: <%= 2*SCALE %>
-  longitude: <%= 2*SCALE %>
-  changeset_id: 4
-  visible: true
-  version: 2
-  tile: <%= QuadTile.tile_for_point(1,1) %>
-  timestamp: 2008-01-01 00:02:00
-
-node_with_versions_v3:
-  node_id: 15
-  latitude: <%= 1*SCALE %>
-  longitude: <%= 1*SCALE %>
-  changeset_id: 4
-  visible: true
-  version: 3
-  tile: <%= QuadTile.tile_for_point(1,1) %>
-  timestamp: 2008-01-01 00:03:00
-
-node_with_versions_v4:
-  node_id: 15
-  latitude: <%= 1*SCALE %>
-  longitude: <%= 1*SCALE %>
-  changeset_id: 4
-  visible: true
-  version: 4
-  tile: <%= QuadTile.tile_for_point(1,1) %>
-  timestamp: 2008-01-01 00:04:00
-  
-public_visible_node:
-  node_id: 16
-  latitude: <%= 1*SCALE %>
-  longitude: <%= 1*SCALE %>
-  changeset_id: 2
-  visible: true
-  version: 1
-  tile: <%= QuadTile.tile_for_point(1,1) %>
-  timestamp: 2007-01-01 00:00:00
-
-redacted_node_redacted_version:
-  node_id: 17
-  latitude: <%= 1*SCALE %>
-  longitude: <%= 1*SCALE %>
-  changeset_id: 2
-  visible: true
-  version: 1
-  tile: <%= QuadTile.tile_for_point(1,1) %>
-  timestamp: 2007-01-01 00:00:00
-  redaction_id: 1
-
-redacted_node_current_version:
-  node_id: 17
-  latitude: <%= 1*SCALE %>
-  longitude: <%= 1*SCALE %>
-  changeset_id: 2
-  visible: false
-  version: 2
-  tile: <%= QuadTile.tile_for_point(1,1) %>
-  timestamp: 2007-01-01 00:00:00
-
-node_with_name_redacted_version:
-  node_id: 18
-  latitude: <%= 1*SCALE %>
-  longitude: <%= 1*SCALE %>
-  changeset_id: 2
-  visible: true
-  version: 1
-  tile: <%= QuadTile.tile_for_point(1,1) %>
-  timestamp: 2007-01-01 00:00:00
-  redaction_id: 1
-
-node_with_name_current_version:
-  node_id: 18
-  latitude: <%= 1*SCALE %>
-  longitude: <%= 1*SCALE %>
-  changeset_id: 2
-  visible: true
-  version: 2
-  tile: <%= QuadTile.tile_for_point(1,1) %>
-  timestamp: 2007-01-01 00:00:00

diff --git a/test/fixtures/redactions.yml b/test/fixtures/redactions.yml
deleted file mode 100644 (file)
index c6e8569..0000000
--- a/test/fixtures/redactions.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
-
-example:
-  id: 1
-  user_id: 5 # the moderator user
-  title: Example redaction
-  description: Usually some text would go here to say something about why the redaction happened.

diff --git a/test/fixtures/relation_members.yml b/test/fixtures/relation_members.yml
deleted file mode 100644 (file)
index a5f04f1..0000000
--- a/test/fixtures/relation_members.yml
+++ /dev/null
@@ -1,103 +0,0 @@
-t1:
-  relation_id: 1
-  sequence_id: 1
-  member_role: "some"
-  member_type: "Way"
-  member_id: 3
-  version: 1
-
-t2:
-  relation_id: 1
-  sequence_id: 2
-  member_role: "some"
-  member_type: "Node"
-  member_id: 5
-  version: 1
-
-t3:
-  relation_id: 1
-  sequence_id: 3
-  member_role: "some"
-  member_type: "Relation"
-  member_id: 3
-  version: 1
-
-t4:
-  relation_id: 3
-  sequence_id: 1
-  member_role: "some"
-  member_type: "Node"
-  member_id: 5
-  version: 1
-
-t5:
-  relation_id: 2
-  sequence_id: 1
-  member_role: "some"
-  member_type: "Node"
-  member_id: 5
-  version: 1
-  
-public_used:
-  relation_id: 6
-  sequence_id: 1
-  member_role: "used by other relation"
-  member_type: "Relation"
-  member_id: 5
-  version: 1
-
-r8_v1_m1:
-  relation_id: 8
-  sequence_id: 1
-  member_role: "some node"
-  member_type: "Node"
-  member_id: 15
-  version: 1
-
-r8_v2_m1:
-  relation_id: 8
-  sequence_id: 1
-  member_role: "some changed node"
-  member_type: "Node"
-  member_id: 15
-  version: 2
-
-r8_v3_m1:
-  relation_id: 8
-  sequence_id: 1
-  member_role: "some changed node"
-  member_type: "Node"
-  member_id: 15
-  version: 3
-
-r8_v3_m3:
-  relation_id: 8
-  sequence_id: 2
-  member_role: "some relation"
-  member_type: "Relation"
-  member_id: 7
-  version: 3
-
-r8_v4_m1:
-  relation_id: 8
-  sequence_id: 1
-  member_role: "some node"
-  member_type: "Node"
-  member_id: 15
-  version: 4
-
-r8_v4_m2:
-  relation_id: 8
-  sequence_id: 2
-  member_role: "some way"
-  member_type: "Way"
-  member_id: 4
-  version: 4
-
-r8_v4_m3:
-  relation_id: 8
-  sequence_id: 3
-  member_role: "some relation"
-  member_type: "Relation"
-  member_id: 7
-  version: 4

diff --git a/test/fixtures/relations.yml b/test/fixtures/relations.yml
deleted file mode 100644 (file)
index 0640bf2..0000000
--- a/test/fixtures/relations.yml
+++ /dev/null
@@ -1,99 +0,0 @@
-visible_relation:
-  relation_id: 1
-  changeset_id: 1
-  timestamp: 2007-01-01 00:00:00
-  visible: true
-  version: 1
-
-invisible_relation:
-  relation_id: 2
-  changeset_id: 3
-  timestamp: 2007-01-01 00:00:00
-  visible: false
-  version: 1
-
-used_relation:
-  relation_id: 3
-  changeset_id: 1
-  timestamp: 2007-01-01 00:00:00
-  visible: true
-  version: 1
-  
-multi_tag_relation:
-  relation_id: 4
-  changeset_id: 4
-  timestamp: 2009-04-21 09:50:57
-  visible: true
-  version: 1
-  
-public_used_relation:
-  relation_id: 5
-  changeset_id: 2
-  timestamp: 2009-04-22 00:30:03
-  visible: true
-  version: 1
-  
-public_visible_relation:
-  relation_id: 6
-  changeset_id: 2
-  timestamp: 2009-04-22 00:34:12
-  visible: true
-  version: 1
-
-relation_with_redacted_versions_v1:
-  relation_id: 7
-  changeset_id: 4
-  timestamp: 2008-01-01 00:04:10
-  visible: true
-  version: 1
-
-relation_with_redacted_versions_v2:
-  relation_id: 7
-  changeset_id: 4
-  timestamp: 2008-01-01 00:04:11
-  visible: true
-  version: 2
-  redaction_id: 1
-
-relation_with_redacted_versions_v3:
-  relation_id: 7
-  changeset_id: 4
-  timestamp: 2008-01-01 00:04:12
-  visible: true
-  version: 3
-  redaction_id: 1
-
-relation_with_redacted_versions_v4:
-  relation_id: 7
-  changeset_id: 4
-  timestamp: 2008-01-01 00:04:13
-  visible: true
-  version: 4
-
-relation_with_versions_v1:
-  relation_id: 8
-  changeset_id: 4
-  timestamp: 2008-01-01 00:01:00
-  visible: true
-  version: 1
-
-relation_with_versions_v2:
-  relation_id: 8
-  changeset_id: 4
-  timestamp: 2008-01-01 00:02:00
-  visible: true
-  version: 2
-
-relation_with_versions_v3:
-  relation_id: 8
-  changeset_id: 4
-  timestamp: 2008-01-01 00:03:00
-  visible: true
-  version: 3
-
-relation_with_versions_v4:
-  relation_id: 8
-  changeset_id: 4
-  timestamp: 2008-01-01 00:04:00
-  visible: true
-  version: 4

diff --git a/test/fixtures/user_roles.yml b/test/fixtures/user_roles.yml
deleted file mode 100644 (file)
index 980d5e8..0000000
--- a/test/fixtures/user_roles.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-
-administrator:
-  user_id: 6
-  role: administrator
-  granter_id: 6
-
-moderator:
-  user_id: 5
-  role: moderator
-  granter_id: 6
-
-second_moderator:
-  user_id: 15
-  role: moderator
-  granter_id: 6
-
-super_moderator:
-  user_id: 16
-  role: moderator
-  granter_id: 6
-
-super_administrator:
-  user_id: 16
-  role: administrator
-  granter_id: 6

diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
deleted file mode 100644 (file)
index 18b33f6..0000000
--- a/test/fixtures/users.yml
+++ /dev/null
@@ -1,349 +0,0 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-normal_user:
-  id: 1
-  email: test@openstreetmap.org
-  status: active
-  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
-  creation_time: "2007-01-01 00:00:00"
-  display_name: test
-  data_public: false
-  description: test
-  home_lat: 12.1
-  home_lon: 12.1
-  home_zoom: 3
-  terms_agreed: "2010-01-01 11:22:33"
-  terms_seen: true
-  languages: en
-  creation_ip: "1.2.3.4"
-
-public_user:
-  id: 2
-  email: test@example.com
-  status: active
-  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
-  creation_time: "2008-05-01 01:23:45"
-  display_name: test2
-  data_public: true
-  description: some test description
-  home_lat: 12
-  home_lon: 12
-  home_zoom: 12
-  terms_agreed: "2010-01-01 11:22:33"
-  terms_seen: true
-  languages: "en de"
-  creation_ip: "4.5.6.7"
-
-inactive_user:
-  id: 3
-  email: inactive@openstreetmap.org
-  status: pending
-  pass_crypt: <%= Digest::MD5::hexdigest('test2') %>
-  creation_time: "2008-07-01 02:23:45"
-  display_name: Inactive User
-  data_public: true
-  description: description
-  home_lat: 123.4
-  home_lon: 12.34
-  home_zoom: 15
-  terms_agreed: "2010-01-01 11:22:33"
-  terms_seen: true
-  languages: en
-  email_valid: false
-
-second_public_user:
-  id: 4
-  email: public@OpenStreetMap.org
-  new_email: new_public@OpenStreetMap.org
-  status: active
-  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
-  creation_time: "2008-05-01 01:23:45"
-  display_name: pulibc_test2
-  data_public: true
-  description: some test description
-  home_lat: 89
-  home_lon: 87
-  home_zoom: 12
-  terms_agreed: "2010-01-01 11:22:33"
-  terms_seen: true
-  creation_ip: "1.2.3.4"
-
-moderator_user:
-  id: 5
-  email: moderator@example.com
-  status: active
-  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
-  creation_time: "2008-05-01 01:23:45"
-  display_name: moderator
-  data_public: true
-  terms_agreed: "2010-01-01 11:22:33"
-  terms_seen: true
-  languages: en
-  image_use_gravatar: false
-
-administrator_user:
-  id: 6
-  email: administrator@example.com
-  status: active
-  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
-  creation_time: "2008-05-01 01:23:45"
-  display_name: administrator
-  data_public: true
-  terms_agreed: "2010-01-01 11:22:33"
-  terms_seen: true
-  languages: en
-
-terms_not_seen_user:
-  id: 7
-  email: not_agreed@example.com
-  status: active
-  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
-  creation_time: "2011-03-22 00:23:45"
-  display_name: not_agreed
-  data_public: true
-  terms_seen: false
-  languages: en
-
-openid_user:
-  id: 8
-  email: openid-user@example.com
-  status: active
-  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
-  creation_time: "2008-05-01 01:23:45"
-  display_name: openIDuser
-  data_public: true
-  auth_provider: openid
-  auth_uid: http://localhost:1123/john.doe
-  terms_agreed: "2010-01-01 11:22:33"
-  terms_seen: true
-  languages: en
-
-uppercase_user:
-  id: 9
-  email: TEST@OPENSTREETMAP.ORG
-  status: active
-  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
-  creation_time: "2007-01-01 00:00:00"
-  display_name: TEST
-  data_public: true
-  description: test
-  terms_agreed: "2010-01-01 11:22:33"
-  terms_seen: true
-  languages: en
-
-suspended_user:
-  id: 10
-  email: suspended@openstreetmap.org
-  status: suspended
-  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
-  creation_time: "2007-01-01 00:00:00"
-  display_name: suspended user
-  data_public: true
-  description: test
-  terms_agreed: "2010-01-01 11:22:33"
-  terms_seen: true
-  languages: en
-
-deleted_user:
-  id: 11
-  email: deleted@openstreetmap.org
-  status: deleted
-  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
-  creation_time: "2007-01-01 00:00:00"
-  display_name: deleted
-  data_public: true
-  description: test
-  terms_agreed: "2010-01-01 11:22:33"
-  terms_seen: true
-  languages: en
-
-confirmed_user:
-  id: 12
-  email: confirmed@openstreetmap.org
-  status: confirmed
-  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
-  creation_time: "2007-01-01 00:00:00"
-  display_name: confirmed
-  data_public: true
-  description: test
-  terms_agreed: "2010-01-01 11:22:33"
-  terms_seen: true
-  languages: en
-
-blocked_user:
-  id: 13
-  email: blocked@openstreetmap.org
-  status: active
-  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
-  creation_time: "2007-01-01 00:00:00"
-  display_name: blocked
-  data_public: true
-  description: test
-  terms_agreed: "2010-01-01 11:22:33"
-  terms_seen: true
-  languages: en
-
-unblocked_user:
-  id: 14
-  email: unblocked@openstreetmap.org
-  status: active
-  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
-  creation_time: "2007-01-01 00:00:00"
-  display_name: unblocked
-  data_public: true
-  description: test
-  terms_agreed: "2010-01-01 11:22:33"
-  terms_seen: true
-  languages: en
-
-second_moderator_user:
-  id: 15
-  email: second_moderator@example.com
-  status: active
-  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
-  creation_time: "2008-05-01 01:23:45"
-  display_name: second_moderator
-  data_public: true
-  terms_agreed: "2010-01-01 11:22:33"
-  terms_seen: true
-  languages: en
-
-super_user:
-  id: 16
-  email: super@example.com
-  status: active
-  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
-  creation_time: "2008-05-01 01:23:45"
-  display_name: super
-  data_public: true
-  terms_agreed: "2010-01-01 11:22:33"
-  terms_seen: true
-  languages: en
-
-north_pole_user:
-  id: 17
-  email: santa@example.com
-  status: active
-  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
-  creation_time: "2008-05-01 01:23:45"
-  display_name: santa
-  data_public: true
-  terms_agreed: "2010-01-01 11:22:33"
-  terms_seen: true
-  languages: en
-  home_lat: 89.9
-  home_lon: 146.8
-
-german_user:
-  id: 18
-  email: german@example.com
-  status: active
-  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
-  creation_time: "2008-05-01 01:23:45"
-  display_name: germanuser
-  data_public: true
-  description: deutsch sprechen
-  home_lat: 11.9
-  home_lon: 12.1
-  home_zoom: 12
-  terms_agreed: "2010-01-01 11:22:33"
-  terms_seen: true
-  languages: de
-
-google_user:
-  id: 19
-  email: google-user@example.com
-  status: active
-  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
-  creation_time: "2008-05-01 01:23:45"
-  display_name: googleuser
-  data_public: true
-  auth_provider: google
-  auth_uid: 123456789
-  terms_agreed: "2010-01-01 11:22:33"
-  terms_seen: true
-  languages: en
-
-facebook_user:
-  id: 20
-  email: facebook-user@example.com
-  status: active
-  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
-  creation_time: "2008-05-01 01:23:45"
-  display_name: facebookuser
-  data_public: true
-  auth_provider: facebook
-  auth_uid: 123456789
-  terms_agreed: "2010-01-01 11:22:33"
-  terms_seen: true
-  languages: en
-
-windowslive_user:
-  id: 21
-  email: windowslive-user@example.com
-  status: active
-  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
-  creation_time: "2008-05-01 01:23:45"
-  display_name: windowsliveuser
-  data_public: true
-  auth_provider: windowslive
-  auth_uid: 123456789
-  terms_agreed: "2010-01-01 11:22:33"
-  terms_seen: true
-  languages: en
-
-github_user:
-  id: 22
-  email: github-user@example.com
-  status: active
-  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
-  creation_time: "2008-05-01 01:23:45"
-  display_name: githubuser
-  data_public: true
-  auth_provider: github
-  auth_uid: 123456789
-  terms_agreed: "2010-01-01 11:22:33"
-  terms_seen: true
-  languages: en
-
-first_gravatar_user:
-  id: 23
-  email: g1@OpenStreetMap.org
-  new_email: new_g1@OpenStreetMap.org
-  status: active
-  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
-  creation_time: "2008-05-01 01:23:45"
-  display_name: gravatar1
-  data_public: true
-  description: some test description
-  terms_agreed: "2010-01-01 11:22:33"
-  terms_seen: true
-  creation_ip: "1.2.3.4"
-
-second_gravatar_user:
-  id: 24
-  email: g2@OpenStreetMap.org
-  new_email: new_g2@OpenStreetMap.org
-  image_use_gravatar: true
-  status: active
-  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
-  creation_time: "2008-05-01 01:23:45"
-  display_name: gravatar2
-  data_public: true
-  description: some test description
-  terms_agreed: "2010-01-01 11:22:33"
-  terms_seen: true
-  creation_ip: "1.2.3.4"
-
-wikipedia_user:
-  id: 25
-  email: wikipedia-user@example.com
-  status: active
-  pass_crypt: <%= Digest::MD5.hexdigest('test') %>
-  creation_time: "2008-05-01 01:23:45"
-  display_name: wikipediauser
-  data_public: true
-  auth_provider: wikipedia
-  auth_uid: 123456789
-  terms_agreed: "2010-01-01 11:22:33"
-  terms_seen: true
-  languages: en

diff --git a/test/fixtures/way_nodes.yml b/test/fixtures/way_nodes.yml
deleted file mode 100644 (file)
index 51bf4b8..0000000
--- a/test/fixtures/way_nodes.yml
+++ /dev/null
@@ -1,161 +0,0 @@
-t1a:
-  way_id: 1
-  node_id: 3
-  sequence_id: 1
-  version: 1
-  
-t2:
-  way_id: 2
-  node_id: 3
-  sequence_id: 1
-  version: 1
-
-t3:
-  way_id: 3
-  node_id: 3
-  sequence_id: 1
-  version: 1
-
-w4_v1_n1:
-  way_id: 4
-  node_id: 3
-  sequence_id: 1
-  version: 1
-
-w4_v1_n2:
-  way_id: 4
-  node_id: 4
-  sequence_id: 2
-  version: 1
-
-w4_v2_n1:
-  way_id: 4
-  node_id: 15
-  sequence_id: 1
-  version: 2
-
-w4_v2_n2:
-  way_id: 4
-  node_id: 3
-  sequence_id: 2
-  version: 2
-
-w4_v2_n3:
-  way_id: 4
-  node_id: 4
-  sequence_id: 3
-  version: 2
-
-w4_v3_n1:
-  way_id: 4
-  node_id: 15
-  sequence_id: 1
-  version: 3
-
-w4_v3_n2:
-  way_id: 4
-  node_id: 3
-  sequence_id: 2
-  version: 3
-
-w4_v4_n1:
-  way_id: 4
-  node_id: 15
-  sequence_id: 1
-  version: 4
-
-w5_n1:
-  way_id: 5
-  node_id: 4
-  sequence_id: 1
-  version: 1
-
-w5_n2:
-  way_id: 5
-  node_id: 4
-  sequence_id: 2
-  version: 1
-
-w6_v1_n1:
-  way_id: 6
-  node_id: 3
-  sequence_id: 1
-  version: 1
-
-w6_v1_n2:
-  way_id: 6
-  node_id: 2
-  sequence_id: 2
-  version: 1
-
-w6_v2_n1:
-  way_id: 6
-  node_id: 3
-  sequence_id: 1
-  version: 2
-
-w6_v2_n2:
-  way_id: 6
-  node_id: 2
-  sequence_id: 2
-  version: 2
-
-w6_v3_n1:
-  way_id: 6
-  node_id: 3
-  sequence_id: 1
-  version: 3
-
-w6_v3_n2:
-  way_id: 6
-  node_id: 2
-  sequence_id: 2
-  version: 3
-
-w6_v4_n1:
-  way_id: 6
-  node_id: 3
-  sequence_id: 1
-  version: 4
-
-w6_v4_n2:
-  way_id: 6
-  node_id: 2
-  sequence_id: 2
-  version: 4
-
-w6_v4_n3:
-  way_id: 6
-  node_id: 4
-  sequence_id: 3
-  version: 4
-
-w7_v1_n1:
-  way_id: 7
-  node_id: 2
-  sequence_id: 1
-  version: 1
-
-w7_v1_n2:
-  way_id: 7
-  node_id: 6
-  sequence_id: 2
-  version: 1
-
-w7_v2_n1:
-  way_id: 7
-  node_id: 4
-  sequence_id: 1
-  version: 2
-
-w7_v2_n2:
-  way_id: 7
-  node_id: 15
-  sequence_id: 2
-  version: 2
-
-w7_v2_n3:
-  way_id: 7
-  node_id: 6
-  sequence_id: 3
-  version: 2

diff --git a/test/fixtures/ways.yml b/test/fixtures/ways.yml
deleted file mode 100644 (file)
index 94fd5ae..0000000
--- a/test/fixtures/ways.yml
+++ /dev/null
@@ -1,99 +0,0 @@
-visible_way:
-  way_id: 1
-  changeset_id: 2
-  timestamp: 2007-01-01 00:00:00
-  visible: true
-  version: 1
-
-invisible_way:
-  way_id: 2
-  changeset_id: 2
-  timestamp: 2007-01-01 00:00:00
-  visible: false
-  version: 1
-
-used_way:
-  way_id: 3
-  changeset_id: 2
-  timestamp: 2007-01-01 00:00:00
-  visible: true
-  version: 1
-
-way_with_versions_v1:
-  way_id: 4
-  changeset_id: 4
-  timestamp: 2008-01-01 00:01:00
-  visible: true
-  version: 1
-
-way_with_versions_v2:
-  way_id: 4
-  changeset_id: 4
-  timestamp: 2008-01-01 00:02:00
-  visible: true
-  version: 2
-
-way_with_versions_v3:
-  way_id: 4
-  changeset_id: 4
-  timestamp: 2008-01-01 00:03:00
-  visible: true
-  version: 3
-
-way_with_versions_v4:
-  way_id: 4
-  changeset_id: 4
-  timestamp: 2008-01-01 00:04:00
-  visible: true
-  version: 4
-
-way_with_duplicate_nodes:
-  way_id: 5
-  changeset_id: 2
-  timestamp: 2007-01-01 00:00:00
-  visible: true
-  version: 1
-
-way_with_redacted_versions_v1:
-  way_id: 6
-  changeset_id: 4
-  timestamp: 2008-01-01 00:04:10
-  visible: true
-  version: 1
-
-way_with_redacted_versions_v2:
-  way_id: 6
-  changeset_id: 4
-  timestamp: 2008-01-01 00:04:11
-  visible: true
-  version: 2
-  redaction_id: 1
-
-way_with_redacted_versions_v3:
-  way_id: 6
-  changeset_id: 4
-  timestamp: 2008-01-01 00:04:12
-  visible: true
-  version: 3
-  redaction_id: 1
-
-way_with_redacted_versions_v4:
-  way_id: 6
-  changeset_id: 4
-  timestamp: 2008-01-01 00:04:13
-  visible: true
-  version: 4
-
-way_with_multiple_nodes_v1:
-  way_id: 7
-  changeset_id: 2
-  timestamp: 2007-01-01 00:00:00
-  visible: true
-  version: 1
-
-way_with_multiple_nodes_v2:
-  way_id: 7
-  changeset_id: 4
-  timestamp: 2008-01-01 00:00:00
-  visible: true
-  version: 2

diff --git a/test/test_helper.rb b/test/test_helper.rb
index e475ab4c5656eac8a5742d484dfc50f537e995da..d41a369f88ebb3eaf6f5d0d1cfc3fabc1a967800 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -5,7 +5,6 @@ ENV["RAILS_ENV"] = "test"
 require File.expand_path("../../config/environment", __FILE__)
 require "rails/test_help"
 require "webmock/minitest"
 require File.expand_path("../../config/environment", __FILE__)
 require "rails/test_help"
 require "webmock/minitest"

-load "composite_primary_keys/fixtures.rb"

 
 module ActiveSupport
   class TestCase
 
 module ActiveSupport
   class TestCase