Skip to content

Commit

Permalink
Updating fixture; temp removing test that doesn't match what we do in…
Browse files Browse the repository at this point in the history 
… the API
  • Loading branch information
Mike Krieger committed Mar 2, 2012
1 parent 4cead55 commit 25780e1
Show file tree
Hide file tree
Showing 8 changed files with 3,528 additions and 3,479 deletions.
5,844 changes: 2,938 additions & 2,906 deletions fixtures/media_popular.json
View file

Large diffs are not rendered by default.

696 changes: 352 additions & 344 deletions fixtures/media_search.json
View file

Large diffs are not rendered by default.

207 changes: 105 additions & 102 deletions fixtures/tag_recent_media.json
View file
Original file line number Diff line number Diff line change
@@ -1,189 +1,192 @@
{
"pagination": {},
"pagination": {},
"meta": {
"code": 200
},
},
"data": [
{
"type": "image",
"location": null,
"type": "image",
"tags": [],
"location": null,
"comments": {
"count": 1,
"count": 1,
"data": [
{
"created_time": "1287439973",
"text": "Midnight dancing @kevinjaako. #iPhone #photography",
"created_time": "1287439973",
"text": "Midnight dancing @kevinjaako. #iPhone #photography",
"from": {
"username": "cathycracks",
"username": "cathycracks",
"id": "12053"
},
},
"id": "404609"
}
]
},
},
"caption": {
"created_time": "1287439973",
"text": "Midnight dancing @kevinjaako. #iPhone #photography",
"created_time": "1287439973",
"text": "Midnight dancing @kevinjaako. #iPhone #photography",
"from": {
"username": "cathycracks",
"username": "cathycracks",
"id": "12053"
},
},
"id": "404609"
},
"link": "http://localhost:8000/p/Cbg2/",
},
"link": "http://localhost:8000/p/Cbg2/",
"likes": {
"count": 0
},
"created_time": "1287439896",
},
"created_time": "1287439896",
"images": {
"low_resolution": {
"url": "http://distillery-dev.s3.amazonaws.com/media/2010/10/18/f9d2708b47c54949b9bb48ed676f8d8e_6.jpg",
"width": 480,
"url": "http://distillery-dev.s3.amazonaws.com/media/2010/10/18/f9d2708b47c54949b9bb48ed676f8d8e_6.jpg",
"width": 480,
"height": 480
},
},
"thumbnail": {
"url": "http://distillery-dev.s3.amazonaws.com/media/2010/10/18/f9d2708b47c54949b9bb48ed676f8d8e_5.jpg",
"width": 150,
"url": "http://distillery-dev.s3.amazonaws.com/media/2010/10/18/f9d2708b47c54949b9bb48ed676f8d8e_5.jpg",
"width": 150,
"height": 150
},
},
"standard_resolution": {
"url": "http://distillery-dev.s3.amazonaws.com/media/2010/10/18/f9d2708b47c54949b9bb48ed676f8d8e_7.jpg",
"width": 612,
"url": "http://distillery-dev.s3.amazonaws.com/media/2010/10/18/f9d2708b47c54949b9bb48ed676f8d8e_7.jpg",
"width": 612,
"height": 612
}
},
"user_has_liked": false,
"id": "636982",
},
"user_has_liked": false,
"id": "636982",
"user": {
"username": "cathycracks",
"first_name": "Cathy",
"profile_picture": "http://distillery.s3.amazonaws.com/profiles/profile_12053_75sq_1287858628.jpg",
"id": "12053",
"username": "cathycracks",
"first_name": "Cathy",
"profile_picture": "http://distillery.s3.amazonaws.com/profiles/profile_12053_75sq_1287858628.jpg",
"id": "12053",
"last_name": "Wang"
}
},
},
{
"type": "image",
"location": null,
"type": "image",
"tags": [],
"location": null,
"comments": {
"count": 1,
"count": 1,
"data": [
{
"created_time": "1287237712",
"text": "Van wie is eigenlijk mijn #iPhone",
"created_time": "1287237712",
"text": "Van wie is eigenlijk mijn #iPhone",
"from": {
"username": "edwardvanmeel",
"username": "edwardvanmeel",
"id": "46088"
},
},
"id": "283284"
}
]
},
},
"caption": {
"created_time": "1287237712",
"text": "Van wie is eigenlijk mijn #iPhone",
"created_time": "1287237712",
"text": "Van wie is eigenlijk mijn #iPhone",
"from": {
"username": "edwardvanmeel",
"username": "edwardvanmeel",
"id": "46088"
},
},
"id": "283284"
},
"link": "http://localhost:8000/p/BvOo/",
},
"link": "http://localhost:8000/p/BvOo/",
"likes": {
"count": 1
},
"created_time": "1287237652",
},
"created_time": "1287237652",
"images": {
"low_resolution": {
"url": "http://distillery-dev.s3.amazonaws.com/media/2010/10/16/8848d8d1b48e44f5b4fe8c86a2e4f949_6.jpg",
"width": 480,
"url": "http://distillery-dev.s3.amazonaws.com/media/2010/10/16/8848d8d1b48e44f5b4fe8c86a2e4f949_6.jpg",
"width": 480,
"height": 480
},
},
"thumbnail": {
"url": "http://distillery-dev.s3.amazonaws.com/media/2010/10/16/8848d8d1b48e44f5b4fe8c86a2e4f949_5.jpg",
"width": 150,
"url": "http://distillery-dev.s3.amazonaws.com/media/2010/10/16/8848d8d1b48e44f5b4fe8c86a2e4f949_5.jpg",
"width": 150,
"height": 150
},
},
"standard_resolution": {
"url": "http://distillery-dev.s3.amazonaws.com/media/2010/10/16/8848d8d1b48e44f5b4fe8c86a2e4f949_7.jpg",
"width": 612,
"url": "http://distillery-dev.s3.amazonaws.com/media/2010/10/16/8848d8d1b48e44f5b4fe8c86a2e4f949_7.jpg",
"width": 612,
"height": 612
}
},
"user_has_liked": false,
"id": "455592",
},
"user_has_liked": false,
"id": "455592",
"user": {
"username": "edwardvanmeel",
"first_name": "Edward",
"profile_picture": "http://distillery.s3.amazonaws.com/profiles/profile_46088_75sq_1286621654.jpg",
"id": "46088",
"username": "edwardvanmeel",
"first_name": "Edward",
"profile_picture": "http://distillery.s3.amazonaws.com/profiles/profile_46088_75sq_1286621654.jpg",
"id": "46088",
"last_name": "van Meel"
}
},
},
{
"type": "image",
"location": null,
"type": "image",
"tags": [],
"location": null,
"comments": {
"count": 2,
"count": 2,
"data": [
{
"created_time": "1286395811",
"text": "Front-page worthy: @instagramapp. It's gorgeous. #iPhone",
"created_time": "1286395811",
"text": "Front-page worthy: @instagramapp. It's gorgeous. #iPhone",
"from": {
"username": "nik",
"username": "nik",
"id": "5273"
},
},
"id": "11380"
},
},
{
"created_time": "1286728380",
"text": "I love this app too!",
"created_time": "1286728380",
"text": "I love this app too!",
"from": {
"username": "venetia",
"username": "venetia",
"id": "42294"
},
},
"id": "86708"
}
]
},
},
"caption": {
"created_time": "1286395811",
"text": "Front-page worthy: @instagramapp. It's gorgeous. #iPhone",
"created_time": "1286395811",
"text": "Front-page worthy: @instagramapp. It's gorgeous. #iPhone",
"from": {
"username": "nik",
"username": "nik",
"id": "5273"
},
},
"id": "11380"
},
"link": "http://localhost:8000/p/DBH/",
},
"link": "http://localhost:8000/p/DBH/",
"likes": {
"count": 7
},
"created_time": "1286394994",
},
"created_time": "1286394994",
"images": {
"low_resolution": {
"url": "http://distillery-dev.s3.amazonaws.com/media/2010/10/06/ea33af4f6d5d4a5da569052e94d6b820_6.jpg",
"width": 480,
"url": "http://distillery-dev.s3.amazonaws.com/media/2010/10/06/ea33af4f6d5d4a5da569052e94d6b820_6.jpg",
"width": 480,
"height": 480
},
},
"thumbnail": {
"url": "http://distillery-dev.s3.amazonaws.com/media/2010/10/06/ea33af4f6d5d4a5da569052e94d6b820_5.jpg",
"width": 150,
"url": "http://distillery-dev.s3.amazonaws.com/media/2010/10/06/ea33af4f6d5d4a5da569052e94d6b820_5.jpg",
"width": 150,
"height": 150
},
},
"standard_resolution": {
"url": "http://distillery-dev.s3.amazonaws.com/media/2010/10/06/ea33af4f6d5d4a5da569052e94d6b820_7.jpg",
"width": 612,
"url": "http://distillery-dev.s3.amazonaws.com/media/2010/10/06/ea33af4f6d5d4a5da569052e94d6b820_7.jpg",
"width": 612,
"height": 612
}
},
"user_has_liked": false,
"id": "12359",
},
"user_has_liked": false,
"id": "12359",
"user": {
"username": "nik",
"first_name": "nik",
"profile_picture": "http://distillery.s3.amazonaws.com/profiles/profile_5273_75sq_1286392268.jpg",
"id": "5273",
"username": "nik",
"first_name": "nik",
"profile_picture": "http://distillery.s3.amazonaws.com/profiles/profile_5273_75sq_1286392268.jpg",
"id": "5273",
"last_name": ""
}
}
Expand Down
Loading

0 comments on commit 25780e1

Please sign in to comment.