1 files changed, 19 insertions, 0 deletions
diff --git a/ext/librethinkdbxx/test/upstream/regression/370.yaml b/ext/librethinkdbxx/test/upstream/regression/370.yaml
new file mode 100644
index 00000000..5d4e5c78
--- /dev/null
+++ b/ext/librethinkdbxx/test/upstream/regression/370.yaml
@@ -0,0 +1,19 @@
+desc: Regression tests for issue #370, calling `map` after `db_list` or `table_list`
+tests:
+
+    # Set up a stream
+    - cd: r.db('test').table_create('t370')
+      def: d = r.db('test')
+
+    # Map after db_list
+    - cd: r.db_list().map(r.row)
+      rb: r.db_list.map{|row| row}
+      ot: (['rethinkdb', 'test'])
+
+    # Map after table_list
+    - cd: d.table_list().map(r.row)
+      rb: d.table_list.map{|row| row}
+      ot: (['t370'])
+
+    # clean up
+    - cd: r.db('test').table_drop('t370')