Show More
@@ -1,85 +1,134 b'' | |||||
1 | # coding: utf-8 |
|
1 | # coding: utf-8 | |
2 | """Test the /files/ handler.""" |
|
2 | """Test the /files/ handler.""" | |
3 |
|
3 | |||
4 | import io |
|
4 | import io | |
5 | import os |
|
5 | import os | |
6 | from unicodedata import normalize |
|
6 | from unicodedata import normalize | |
7 |
|
7 | |||
8 | pjoin = os.path.join |
|
8 | pjoin = os.path.join | |
9 |
|
9 | |||
10 | import requests |
|
10 | import requests | |
|
11 | import json | |||
|
12 | ||||
|
13 | from IPython.nbformat.current import (new_notebook, write, new_worksheet, | |||
|
14 | new_heading_cell, new_code_cell, | |||
|
15 | new_output) | |||
11 |
|
16 | |||
12 | from IPython.html.utils import url_path_join |
|
17 | from IPython.html.utils import url_path_join | |
13 | from .launchnotebook import NotebookTestBase |
|
18 | from .launchnotebook import NotebookTestBase | |
14 | from IPython.utils import py3compat |
|
19 | from IPython.utils import py3compat | |
15 |
|
20 | |||
|
21 | ||||
16 | class FilesTest(NotebookTestBase): |
|
22 | class FilesTest(NotebookTestBase): | |
17 | def test_hidden_files(self): |
|
23 | def test_hidden_files(self): | |
18 | not_hidden = [ |
|
24 | not_hidden = [ | |
19 | u'Γ₯ b', |
|
25 | u'Γ₯ b', | |
20 | u'Γ₯ b/Γ§. d', |
|
26 | u'Γ₯ b/Γ§. d', | |
21 | ] |
|
27 | ] | |
22 | hidden = [ |
|
28 | hidden = [ | |
23 | u'.Γ₯ b', |
|
29 | u'.Γ₯ b', | |
24 | u'Γ₯ b/.Γ§ d', |
|
30 | u'Γ₯ b/.Γ§ d', | |
25 | ] |
|
31 | ] | |
26 | dirs = not_hidden + hidden |
|
32 | dirs = not_hidden + hidden | |
27 |
|
33 | |||
28 | nbdir = self.notebook_dir.name |
|
34 | nbdir = self.notebook_dir.name | |
29 | for d in dirs: |
|
35 | for d in dirs: | |
30 | path = pjoin(nbdir, d.replace('/', os.sep)) |
|
36 | path = pjoin(nbdir, d.replace('/', os.sep)) | |
31 | if not os.path.exists(path): |
|
37 | if not os.path.exists(path): | |
32 | os.mkdir(path) |
|
38 | os.mkdir(path) | |
33 | with open(pjoin(path, 'foo'), 'w') as f: |
|
39 | with open(pjoin(path, 'foo'), 'w') as f: | |
34 | f.write('foo') |
|
40 | f.write('foo') | |
35 | with open(pjoin(path, '.foo'), 'w') as f: |
|
41 | with open(pjoin(path, '.foo'), 'w') as f: | |
36 | f.write('.foo') |
|
42 | f.write('.foo') | |
37 | url = self.base_url() |
|
43 | url = self.base_url() | |
38 |
|
44 | |||
39 | for d in not_hidden: |
|
45 | for d in not_hidden: | |
40 | path = pjoin(nbdir, d.replace('/', os.sep)) |
|
46 | path = pjoin(nbdir, d.replace('/', os.sep)) | |
41 | r = requests.get(url_path_join(url, 'files', d, 'foo')) |
|
47 | r = requests.get(url_path_join(url, 'files', d, 'foo')) | |
42 | r.raise_for_status() |
|
48 | r.raise_for_status() | |
43 | self.assertEqual(r.text, 'foo') |
|
49 | self.assertEqual(r.text, 'foo') | |
44 | r = requests.get(url_path_join(url, 'files', d, '.foo')) |
|
50 | r = requests.get(url_path_join(url, 'files', d, '.foo')) | |
45 | self.assertEqual(r.status_code, 404) |
|
51 | self.assertEqual(r.status_code, 404) | |
46 |
|
52 | |||
47 | for d in hidden: |
|
53 | for d in hidden: | |
48 | path = pjoin(nbdir, d.replace('/', os.sep)) |
|
54 | path = pjoin(nbdir, d.replace('/', os.sep)) | |
49 | for foo in ('foo', '.foo'): |
|
55 | for foo in ('foo', '.foo'): | |
50 | r = requests.get(url_path_join(url, 'files', d, foo)) |
|
56 | r = requests.get(url_path_join(url, 'files', d, foo)) | |
51 | self.assertEqual(r.status_code, 404) |
|
57 | self.assertEqual(r.status_code, 404) | |
52 |
|
58 | |||
|
59 | def test_contents_manager(self): | |||
|
60 | "make sure ContentsManager returns right files (ipynb, bin, txt)." | |||
|
61 | ||||
|
62 | nbdir = self.notebook_dir.name | |||
|
63 | base = self.base_url() | |||
|
64 | ||||
|
65 | nb = new_notebook(name='testnb') | |||
|
66 | ||||
|
67 | ws = new_worksheet() | |||
|
68 | nb.worksheets = [ws] | |||
|
69 | ws.cells.append(new_heading_cell(u'Created by test Β³')) | |||
|
70 | cc1 = new_code_cell(input=u'print(2*6)') | |||
|
71 | cc1.outputs.append(new_output(output_text=u'12', output_type='stream')) | |||
|
72 | ws.cells.append(cc1) | |||
|
73 | ||||
|
74 | with io.open(pjoin(nbdir, 'testnb.ipynb'), 'w', | |||
|
75 | encoding='utf-8') as f: | |||
|
76 | write(nb, f, format='ipynb') | |||
|
77 | ||||
|
78 | with io.open(pjoin(nbdir, 'test.bin'), 'wb') as f: | |||
|
79 | f.write("\x5F\x9D\x3E") | |||
|
80 | f.close() | |||
|
81 | ||||
|
82 | with io.open(pjoin(nbdir, 'test.txt'), 'w') as f: | |||
|
83 | f.write(u'foo\nbar') | |||
|
84 | f.close() | |||
|
85 | ||||
|
86 | r = requests.get(url_path_join(base, 'files', 'testnb.ipynb')) | |||
|
87 | self.assertEqual(r.status_code, 200) | |||
|
88 | self.assertIn(u'print(2*6)', r.text) | |||
|
89 | json.loads(r.text) | |||
|
90 | ||||
|
91 | r = requests.get(url_path_join(base, 'files', 'test.bin')) | |||
|
92 | self.assertEqual(r.status_code, 200) | |||
|
93 | self.assertEqual(r.headers['content-type'], 'application/octet-stream') | |||
|
94 | self.assertEqual(r.content, 'X50+\n') | |||
|
95 | ||||
|
96 | r = requests.get(url_path_join(base, 'files', 'test.txt')) | |||
|
97 | self.assertEqual(r.status_code, 200) | |||
|
98 | self.assertEqual(r.headers['content-type'], 'text/plain') | |||
|
99 | self.assertEqual(r.content, u'foo\nbar') | |||
|
100 | ||||
|
101 | ||||
53 | def test_old_files_redirect(self): |
|
102 | def test_old_files_redirect(self): | |
54 | """pre-2.0 'files/' prefixed links are properly redirected""" |
|
103 | """pre-2.0 'files/' prefixed links are properly redirected""" | |
55 | nbdir = self.notebook_dir.name |
|
104 | nbdir = self.notebook_dir.name | |
56 | base = self.base_url() |
|
105 | base = self.base_url() | |
57 |
|
106 | |||
58 | os.mkdir(pjoin(nbdir, 'files')) |
|
107 | os.mkdir(pjoin(nbdir, 'files')) | |
59 | os.makedirs(pjoin(nbdir, 'sub', 'files')) |
|
108 | os.makedirs(pjoin(nbdir, 'sub', 'files')) | |
60 |
|
109 | |||
61 | for prefix in ('', 'sub'): |
|
110 | for prefix in ('', 'sub'): | |
62 | with open(pjoin(nbdir, prefix, 'files', 'f1.txt'), 'w') as f: |
|
111 | with open(pjoin(nbdir, prefix, 'files', 'f1.txt'), 'w') as f: | |
63 | f.write(prefix + '/files/f1') |
|
112 | f.write(prefix + '/files/f1') | |
64 | with open(pjoin(nbdir, prefix, 'files', 'f2.txt'), 'w') as f: |
|
113 | with open(pjoin(nbdir, prefix, 'files', 'f2.txt'), 'w') as f: | |
65 | f.write(prefix + '/files/f2') |
|
114 | f.write(prefix + '/files/f2') | |
66 | with open(pjoin(nbdir, prefix, 'f2.txt'), 'w') as f: |
|
115 | with open(pjoin(nbdir, prefix, 'f2.txt'), 'w') as f: | |
67 | f.write(prefix + '/f2') |
|
116 | f.write(prefix + '/f2') | |
68 | with open(pjoin(nbdir, prefix, 'f3.txt'), 'w') as f: |
|
117 | with open(pjoin(nbdir, prefix, 'f3.txt'), 'w') as f: | |
69 | f.write(prefix + '/f3') |
|
118 | f.write(prefix + '/f3') | |
70 |
|
119 | |||
71 | url = url_path_join(base, 'notebooks', prefix, 'files', 'f1.txt') |
|
120 | url = url_path_join(base, 'notebooks', prefix, 'files', 'f1.txt') | |
72 | r = requests.get(url) |
|
121 | r = requests.get(url) | |
73 | self.assertEqual(r.status_code, 200) |
|
122 | self.assertEqual(r.status_code, 200) | |
74 | self.assertEqual(r.text, prefix + '/files/f1') |
|
123 | self.assertEqual(r.text, prefix + '/files/f1') | |
75 |
|
124 | |||
76 | url = url_path_join(base, 'notebooks', prefix, 'files', 'f2.txt') |
|
125 | url = url_path_join(base, 'notebooks', prefix, 'files', 'f2.txt') | |
77 | r = requests.get(url) |
|
126 | r = requests.get(url) | |
78 | self.assertEqual(r.status_code, 200) |
|
127 | self.assertEqual(r.status_code, 200) | |
79 | self.assertEqual(r.text, prefix + '/files/f2') |
|
128 | self.assertEqual(r.text, prefix + '/files/f2') | |
80 |
|
129 | |||
81 | url = url_path_join(base, 'notebooks', prefix, 'files', 'f3.txt') |
|
130 | url = url_path_join(base, 'notebooks', prefix, 'files', 'f3.txt') | |
82 | r = requests.get(url) |
|
131 | r = requests.get(url) | |
83 | self.assertEqual(r.status_code, 200) |
|
132 | self.assertEqual(r.status_code, 200) | |
84 | self.assertEqual(r.text, prefix + '/f3') |
|
133 | self.assertEqual(r.text, prefix + '/f3') | |
85 |
|
134 |
General Comments 0
You need to be logged in to leave comments.
Login now