From 6277cefa070a6420e16bf4091b1406dcd8519f79 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Mon, 8 Apr 2019 16:57:35 -0600
Subject: [PATCH] Clean up assertion style

I prefer to express only one assertion per line rather than &&-ing
together multiple assertions into a condition. I also prefer to use
equality assertions so that failure messages include more information
about the actual and expected values.

I used nested scope blocks so we could re-define the `range` constant in
a local scope without needing to mutate a variable across unrelated
tests.
---
 spec/text-editor-spec.js | 75 ++++++++++++++++++++++++++--------------
 1 file changed, 49 insertions(+), 26 deletions(-)

diff --git a/spec/text-editor-spec.js b/spec/text-editor-spec.js
index 03cceef36..0018284b7 100644
--- a/spec/text-editor-spec.js
+++ b/spec/text-editor-spec.js
@@ -8425,41 +8425,64 @@ describe('TextEditor', () => {
         expect(editor.lineTextForBufferRow(0)).toBe('test')
       })
 
-      it('does not select the new delimiters', () => {
+      fit('does not select the new delimiters', () => {
         editor.setText('<!-- test -->')
-
         let delimLength = '<!--'.length
-        let selection = editor.addCursorAtBufferPosition([0, delimLength]).selection
+        let selection = editor.addSelectionForBufferRange([[0, delimLength], [0, delimLength]])
 
-        selection.toggleLineComments()
-        expect(selection.isEmpty() && selection.getBufferRange().start.column === 0).toBe(true)
+        {
+          selection.toggleLineComments()
 
-        selection.toggleLineComments()
-        expect(selection.isEmpty()).toBe(true)
-        expect(selection.getBufferRange().start.column).toBe(delimLength + 1)
+          const range = selection.getBufferRange()
+          expect(range.isEmpty()).toBe(true)
+          expect(range.start.column).toBe(0)
+        }
 
-        selection.setBufferRange([[0, delimLength], [0, delimLength + 1 + 'test'.length]])
+        {
+          selection.toggleLineComments()
 
-        selection.toggleLineComments()
-        let range = selection.getBufferRange()
-        expect(range.start.column === 0 && range.end.column === 'test'.length).toBe(true)
+          const range = selection.getBufferRange()
+          expect(range.isEmpty()).toBe(true)
+          expect(range.start.column).toBe(delimLength + 1)
+        }
 
-        selection.toggleLineComments()
-        range = selection.getBufferRange()
-        expect(range.start.column === delimLength + 1 && range.end.column === delimLength + 1 + 'test'.length).toBe(true)
+        {
+          selection.setBufferRange([[0, delimLength], [0, delimLength + 1 + 'test'.length]])
+          selection.toggleLineComments()
 
-        editor.setText('    test')
-        selection.setBufferRange([[0, 4], [0,4]])
-        selection.toggleLineComments()
-        expect(selection.isEmpty()).toBe(true)
-        expect(selection.getBufferRange().start.column).toBe(4 + delimLength + 1)
+          const range = selection.getBufferRange()
+          expect(range.start.column).toBe(0)
+          expect(range.end.column).toBe('test'.length)
+        }
 
-        editor.setText('    test')
-        selection.setBufferRange([[0, 8], [0, 8]])
-        selection.selectToBeginningOfWord()
-        selection.toggleLineComments()
-        expect(selection.getBufferRange().start.column).toBe(4 + delimLength + 1)
-        expect(selection.getBufferRange().end.column).toBe(4 + delimLength + 1 + 4)
+        {
+          selection.toggleLineComments()
+
+          const range = selection.getBufferRange()
+          expect(range.start.column).toBe(delimLength + 1)
+          expect(range.end.column).toBe(delimLength + 1 + 'test'.length)
+        }
+
+        {
+          editor.setText('    test')
+          selection.setBufferRange([[0, 4], [0,4]])
+          selection.toggleLineComments()
+
+          const range = selection.getBufferRange()
+          expect(range.isEmpty()).toBe(true)
+          expect(range.start.column).toBe(4 + delimLength + 1)
+        }
+
+        {
+          editor.setText('    test')
+          selection.setBufferRange([[0, 8], [0, 8]])
+          selection.selectToBeginningOfWord()
+          selection.toggleLineComments()
+
+          const range = selection.getBufferRange()
+          expect(range.start.column).toBe(4 + delimLength + 1)
+          expect(range.end.column).toBe(4 + delimLength + 1 + 4)
+        }
       })
     })