Merge lp:~elopio/cloudspacesclient/upload_file into lp:cloudspacesclient

[Leo Arias]

Added the test to upload a file.

[lp:~elopio/cloudspacesclient/upload_file]

34. By Leo Arias on 2013-11-29

Removed the conflict file.

35. By Leo Arias on 2013-12-04

Merged with trunk.

36. By Leo Arias on 2013-12-06

Merged with trunk.

37. By Leo Arias on 2013-12-06

Updated the vars.

38. By Leo Arias on 2013-12-06

Updated the size.

39. By Leo Arias on 2013-12-06

The hash is not none.

40. By Leo Arias on 2013-12-06

Fixed the method call.

[Richard Huddie (rhuddie)]

review: Approve

=== modified file 'src/cloudspacesclient/tests/conformance/test_cloudspaces_api.py'
--- src/cloudspacesclient/tests/conformance/test_cloudspaces_api.py	2013-12-06 15:26:59 +0000
+++ src/cloudspacesclient/tests/conformance/test_cloudspaces_api.py	2013-12-06 16:54:26 +0000
@@ -239,7 +239,7 @@
         self._assert_json_object_values(expected, metadata)
 
     def test_create_new_file(self):
-        test_file_name = 'test.txt'
+        test_file_name = 'new_test_file.txt'
         test_file_mimetype = 'text/plain'
 
         metadata = self.cloudspaces_api_client.make_file(
@@ -266,6 +266,40 @@
         # TODO check the user_id. --elopio - 2013-11-27
         # TODO Check the volume_id field. --elopio - 2013-11-27
 
+    def test_upload_file(self):
+        test_file_name = 'file_to_upload.txt'
+        test_file_mimetype = 'text/plain'
+
+        new_file_metadata = self.cloudspaces_api_client.make_file(
+            self.root_node_id, test_file_name)
+        file_node_id = new_file_metadata.get('node_id')
+
+        file_upload_metadata = self.cloudspaces_api_client.put_file(
+            file_node_id, 'test contents')
+
+        validictory.validate(
+            file_upload_metadata, schemas.GET_FILE_METADATA_RESPONSE_SCHEMA)
+
+        root_path = self.test_server.get_root_path()
+        expected = dict(
+            filename=test_file_name, is_deleted=False, is_folder=False,
+            mimetype=test_file_mimetype, parent_node_id=self.root_node_id,
+            path=root_path, size=13)
+        self._assert_json_object_values(expected, file_upload_metadata)
+
+        # Assert that the file has just been modified.
+        self.assert_datetime_limits(
+            parser.parse(file_upload_metadata.get('server_modified')),
+            self.start_datetime, self._get_now_datetime())
+        # TODO update the spec because it says checksum instead of hash.
+        # --elopio - 2013-11-27
+        # TODO The spec doesn't include it in the filename in the examples.
+        # --elopio - 2013-11-25
+        # TODO check the user_id. --elopio - 2013-11-27
+        # TODO Check the volume_id field. --elopio - 2013-11-27
+        # TODO Check the hash, that depends on the server implementation.
+        # --elopio - 2013-12-06
+
     def test_download_empty_file(self):
         test_file_name = 'test_file_to_download.txt'
         create_metadata = self.cloudspaces_api_client.make_file(