Revision 9829e3b6 userdata/tests.py

b/userdata/tests.py
31 31
        self.user = User.objects.get(pk=1)
32 32

  
33 33
    def test_keys_collection_get(self):
34
        resp = self.client.get("/keys/")
34
        resp = self.client.get("/keys")
35 35
        self.assertEqual(resp.content, "[]")
36 36

  
37 37
        PublicKeyPair.objects.create(user=self.user, name="key pair 1",
38 38
                content="content1")
39 39

  
40
        resp = self.client.get("/keys/")
41
        self.assertEqual(resp.content, """[{"content": "content1", "uri": "/keys/1/", "name": "key pair 1", "id": 1}]""")
40
        resp = self.client.get("/keys")
41
        self.assertEqual(resp.content, """[{"content": "content1", "uri": "/keys/1", "name": "key pair 1", "id": 1}]""")
42 42

  
43 43
        PublicKeyPair.objects.create(user=self.user, name="key pair 2",
44 44
                content="content2")
45 45

  
46
        resp = self.client.get("/keys/")
47
        self.assertEqual(resp.content, """[{"content": "content1", "uri": "/keys/1/", "name": "key pair 1", "id": 1}, {"content": "content2", "uri": "/keys/2/", "name": "key pair 2", "id": 2}]""")
46
        resp = self.client.get("/keys")
47
        self.assertEqual(resp.content, """[{"content": "content1", "uri": "/keys/1", "name": "key pair 1", "id": 1}, {"content": "content2", "uri": "/keys/2", "name": "key pair 2", "id": 2}]""")
48 48

  
49 49
    def test_keys_resourse_get(self):
50
        resp = self.client.get("/keys/1/")
50
        resp = self.client.get("/keys/1")
51 51
        self.assertEqual(resp.status_code, 404)
52 52

  
53 53
        # create a public key
54 54
        PublicKeyPair.objects.create(user=self.user, name="key pair 1",
55 55
                content="content1")
56
        resp = self.client.get("/keys/1/")
57
        self.assertEqual(resp.content, """{"content": "content1", "uri": "/keys/1/", "name": "key pair 1", "id": 1}""")
56
        resp = self.client.get("/keys/1")
57
        self.assertEqual(resp.content, """{"content": "content1", "uri": "/keys/1", "name": "key pair 1", "id": 1}""")
58 58

  
59 59
        # update
60
        resp = self.client.post("/keys/1/", json.dumps({'name':'key pair 1 new name'}),
60
        resp = self.client.put("/keys/1", json.dumps({'name':'key pair 1 new name'}),
61 61
                content_type='application/json')
62 62
        pk = PublicKeyPair.objects.get(pk=1)
63 63
        self.assertEqual(pk.name, "key pair 1 new name")
64 64

  
65 65
        # delete
66
        resp = self.client.delete("/keys/1/")
66
        resp = self.client.delete("/keys/1")
67 67
        self.assertEqual(PublicKeyPair.objects.count(), 0)
68 68

  
69
        resp = self.client.get("/keys/1/")
69
        resp = self.client.get("/keys/1")
70 70
        self.assertEqual(resp.status_code, 404)
71 71

  
72
        resp = self.client.get("/keys/")
72
        resp = self.client.get("/keys")
73 73
        self.assertEqual(resp.content, "[]")
74

  
75
        # test rest create
76
        resp = self.client.post("/keys", json.dumps({'name':'key pair 2',
77
            'content':"""key 2 content"""}),
78
                content_type='application/json')
79
        self.assertEqual(PublicKeyPair.objects.count(), 1)
80
        pk = PublicKeyPair.objects.get(pk=1)
81
        self.assertEqual(pk.name, "key pair 2")
82
        self.assertEqual(pk.content, "key 2 content")
83

  

Also available in: Unified diff