merge upstream/master and resolve conflicts from https://github.com/openstreetmap...

[rails.git] / test / fixtures / client_applications.yml

diff --git a/test/fixtures/client_applications.yml b/test/fixtures/client_applications.yml
index e8087eb98dfa3bd24ef4ffe093e5617319125c7a..13f9c086ab76bd94e01bbb99f9712410e2de90f3 100644 (file)
--- a/test/fixtures/client_applications.yml
+++ b/test/fixtures/client_applications.yml
@@ -20,6 +20,7 @@ oauth_web_app:
 oauth_desktop_app:
   name: Some OAuth Desktop App
   created_at: "2009-04-21 00:00:00"
+  url: http://some.desktop.app.org/
   support_url: http://some.desktop.app.org/support
   updated_at: "2009-04-21 00:00:00"
   user_id: 2
@@ -31,3 +32,19 @@ oauth_desktop_app:
   allow_write_api: true
   allow_read_gpx: true
   allow_write_gpx: false
+
+normal_user_app:
+  name: Some OAuth Desktop App
+  created_at: "2009-05-21 00:00:00"
+  url: http://some.desktop.app.org/
+  support_url: http://some.desktop.app.org/support
+  updated_at: "2009-05-21 00:00:00"
+  user_id: 1
+  secret: jgYx43yx1FAMQbG6T0qZhvvFsKEf6Pgd5XfHr5kFgv4
+  key: N6KVhfeaT626fhBt9aCMeA
+  allow_read_prefs: true
+  allow_write_prefs: false
+  allow_write_diary: false
+  allow_write_api: true
+  allow_read_gpx: true
+  allow_write_gpx: false