Fixed the tests with new changes

t/cell.vim

@@ -3,7 +3,8 @@ source t/config/options.vim
 
 call vspec#hint({'scope': 'tablemode#spreadsheet#cell#scope()', 'sid': 'tablemode#spreadsheet#cell#sid()'})
 
-describe 'cell API'
+describe 'cell'
+  describe 'API'
     before
       new
       read t/fixtures/sample.txt
@@ -46,4 +47,83 @@ describe 'cell API'
       Expect tablemode#spreadsheet#cell#GetCellRange('1:-1', 2, 2) == ['test12']
       Expect tablemode#spreadsheet#cell#GetCellRange('1:-1', 3, 2) == ['test12']
     end
+  end
+
+  describe 'Motions'
+    describe 'left or right'
+      before
+        new
+        normal! ggdG
+        call tablemode#TableModeEnable()
+        normal i|test11|test12|
+|test21|test22|
+        call cursor(1, 3)
+      end
+
+      it 'should move left when not on first column'
+        call cursor(1, 12)
+        Expect tablemode#spreadsheet#ColumnNr('.') == 2
+        call tablemode#spreadsheet#cell#Motion('h')
+        Expect tablemode#spreadsheet#ColumnNr('.') == 1
+      end
+
+      it 'should move to the previous row last column if it exists when on first column'
+        call cursor(2, 3)
+        Expect tablemode#spreadsheet#RowNr('.') == 2
+        Expect tablemode#spreadsheet#ColumnNr('.') == 1
+        call tablemode#spreadsheet#cell#Motion('h')
+        Expect tablemode#spreadsheet#RowNr('.') == 1
+        Expect tablemode#spreadsheet#ColumnNr('.') == 2
+      end
+
+      it 'should move right when not on last column'
+        Expect tablemode#spreadsheet#ColumnNr('.') == 1
+        call tablemode#spreadsheet#cell#Motion('l')
+        Expect tablemode#spreadsheet#ColumnNr('.') == 2
+      end
+
+      it 'should move to the next row first column if it exists when on last column'
+        call cursor(1, 12)
+        Expect tablemode#spreadsheet#RowNr('.') == 1
+        Expect tablemode#spreadsheet#ColumnNr('.') == 2
+        call tablemode#spreadsheet#cell#Motion('l')
+        Expect tablemode#spreadsheet#RowNr('.') == 2
+        Expect tablemode#spreadsheet#ColumnNr('.') == 1
+      end
+    end
+
+    describe 'up or down'
+      before
+        new
+        normal! ggdG
+        call tablemode#TableModeEnable()
+        normal i|test11|test12|
+|test21|test22|
+        call cursor(1, 3)
+      end
+
+      it 'should move a row up unless on first row'
+        call cursor(2, 3)
+        Expect tablemode#spreadsheet#RowNr('.') == 2
+        call tablemode#spreadsheet#cell#Motion('k')
+        Expect tablemode#spreadsheet#RowNr('.') == 1
+      end
+
+      it 'should remain on first row when trying to move up'
+        Expect tablemode#spreadsheet#RowNr('.') == 1
+        call tablemode#spreadsheet#cell#Motion('k')
+        Expect tablemode#spreadsheet#RowNr('.') == 1
+      end
+
+      it 'should move a row down unless on last row'
+        Expect tablemode#spreadsheet#RowNr('.') == 1
+        call tablemode#spreadsheet#cell#Motion('j')
+        Expect tablemode#spreadsheet#RowNr('.') == 2
+      end
+
+      it 'should remain on last row when trying to move down'
+        Expect tablemode#spreadsheet#RowNr('.') == 1
+        call tablemode#spreadsheet#cell#Motion('k')
+        Expect tablemode#spreadsheet#RowNr('.') == 1
+      end
     end

t/table.vim

@@ -39,82 +39,4 @@ describe 'table'
       Expect tablemode#spreadsheet#ColumnCount(2) == 2
     end
   end
-
-  describe 'Motions'
-    describe 'left or right'
-      before
-        new
-        normal! ggdG
-        call tablemode#TableModeEnable()
-        normal i|test11|test12|
-|test21|test22|
-        call cursor(1, 3)
-      end
-
-      it 'should move left when not on first column'
-        call cursor(1, 12)
-        Expect tablemode#spreadsheet#ColumnNr('.') == 2
-        call tablemode#table#TableMotion('h')
-        Expect tablemode#spreadsheet#ColumnNr('.') == 1
-      end
-
-      it 'should move to the previous row last column if it exists when on first column'
-        call cursor(2, 3)
-        Expect tablemode#spreadsheet#RowNr('.') == 2
-        Expect tablemode#spreadsheet#ColumnNr('.') == 1
-        call tablemode#table#TableMotion('h')
-        Expect tablemode#spreadsheet#RowNr('.') == 1
-        Expect tablemode#spreadsheet#ColumnNr('.') == 2
-      end
-
-      it 'should move right when not on last column'
-        Expect tablemode#spreadsheet#ColumnNr('.') == 1
-        call tablemode#table#TableMotion('l')
-        Expect tablemode#spreadsheet#ColumnNr('.') == 2
-      end
-
-      it 'should move to the next row first column if it exists when on last column'
-        call cursor(1, 12)
-        Expect tablemode#spreadsheet#RowNr('.') == 1
-        Expect tablemode#spreadsheet#ColumnNr('.') == 2
-        call tablemode#table#TableMotion('l')
-        Expect tablemode#spreadsheet#RowNr('.') == 2
-        Expect tablemode#spreadsheet#ColumnNr('.') == 1
-      end
-    end
-
-    describe 'up or down'
-      before
-        new
-        normal! ggdG
-        call tablemode#TableModeEnable()
-        normal i|test11|test12|
-|test21|test22|
-        call cursor(1, 3)
-      end
-
-      it 'should move a row up unless on first row'
-        call cursor(2, 3)
-        Expect tablemode#spreadsheet#RowNr('.') == 2
-        call tablemode#table#TableMotion('k')
-        Expect tablemode#spreadsheet#RowNr('.') == 1
-      end
-
-      it 'should remain on first row when trying to move up'
-        Expect tablemode#spreadsheet#RowNr('.') == 1
-        call tablemode#table#TableMotion('k')
-        Expect tablemode#spreadsheet#RowNr('.') == 1
-      end
-
-      it 'should move a row down unless on last row'
-        Expect tablemode#spreadsheet#RowNr('.') == 1
-        call tablemode#table#TableMotion('j')
-        Expect tablemode#spreadsheet#RowNr('.') == 2
-      end
-
-      it 'should remain on last row when trying to move down'
-        Expect tablemode#spreadsheet#RowNr('.') == 1
-        call tablemode#table#TableMotion('k')
-        Expect tablemode#spreadsheet#RowNr('.') == 1
-      end
 end