Remove unused vars from specs

This commit is contained in:
Rafael Oleza
2019-02-22 09:55:30 +01:00
parent c35ec012b4
commit d7d6d0838f
29 changed files with 134 additions and 321 deletions

View File

@@ -1,13 +1,6 @@
/** @babel */
import {
it,
fit,
ffit,
fffit,
beforeEach,
afterEach
} from './async-spec-helpers'
import { it } from './async-spec-helpers'
import ApplicationDelegate from '../src/application-delegate'
describe('ApplicationDelegate', function () {

View File

@@ -1,12 +1,9 @@
const {
it,
fit,
ffit,
beforeEach,
afterEach,
conditionPromise
} = require('./async-spec-helpers')
const _ = require('underscore-plus')
const fs = require('fs')
const path = require('path')
const temp = require('temp').track()
@@ -74,7 +71,7 @@ describe('AtomEnvironment', () => {
it('will open the dev tools when an error is triggered', async () => {
try {
a + 1
a + 1 // eslint-ignore-line no-unused-vars
} catch (e) {
window.onerror.call(window, e.toString(), 'abc', 2, 3, e)
}
@@ -442,7 +439,6 @@ describe('AtomEnvironment', () => {
describe('adding a project folder', () => {
it('does nothing if the user dismisses the file picker', () => {
const initialPaths = atom.project.getPaths()
const tempDirectory = temp.mkdirSync('a-new-directory')
spyOn(atom, 'pickFolder').andCallFake(callback => callback(null))
atom.addProjectFolder()
expect(atom.project.getPaths()).toEqual(initialPaths)
@@ -455,7 +451,7 @@ describe('AtomEnvironment', () => {
})
it('adds the selected folder to the project', async () => {
const initialPaths = atom.project.setPaths([])
atom.project.setPaths([])
const tempDirectory = temp.mkdirSync('a-new-directory')
spyOn(atom, 'pickFolder').andCallFake(callback =>
callback([tempDirectory])
@@ -657,7 +653,6 @@ describe('AtomEnvironment', () => {
describe('::destroy()', () => {
it('does not throw exceptions when unsubscribing from ipc events (regression)', async () => {
const configDirPath = temp.mkdirSync('atom-spec-environment')
const fakeDocument = {
addEventListener () {},
removeEventListener () {},

View File

@@ -1,13 +1,6 @@
/** @babel */
import {
it,
fit,
ffit,
fffit,
beforeEach,
afterEach
} from './async-spec-helpers'
import { it, beforeEach, afterEach } from './async-spec-helpers'
import { app } from 'remote'
import atomPaths from '../src/atom-paths'
import fs from 'fs-plus'

View File

@@ -3,9 +3,6 @@ const fs = require('fs-plus')
const temp = require('temp').track()
const {
it,
fit,
ffit,
fffit,
beforeEach,
afterEach
} = require('./async-spec-helpers')

View File

@@ -1,13 +1,6 @@
const CommandRegistry = require('../src/command-registry')
const _ = require('underscore-plus')
const {
it,
fit,
ffit,
fffit,
beforeEach,
afterEach
} = require('./async-spec-helpers')
const { it, beforeEach, afterEach } = require('./async-spec-helpers')
describe('CommandRegistry', () => {
let registry, parent, child, grandchild

View File

@@ -1,10 +1,8 @@
const {
it,
fit,
ffit,
beforeEach,
afterEach,
conditionPromise
afterEach
} = require('./async-spec-helpers')
const fs = require('fs-plus')
const path = require('path')

View File

@@ -2,14 +2,7 @@
const Grim = require('grim')
import {
it,
fit,
ffit,
fffit,
beforeEach,
afterEach
} from './async-spec-helpers'
import { it } from './async-spec-helpers'
import etch from 'etch'
const getNextUpdatePromise = () => etch.getScheduler().nextUpdatePromise
@@ -344,7 +337,7 @@ describe('Dock', () => {
},
serialize: () => ({ deserializer: 'DockTestItem' })
}
const itemDeserializer = atom.deserializers.add({
atom.deserializers.add({
name: 'DockTestItem',
deserialize: () => item
})

View File

@@ -4,7 +4,7 @@ const temp = require('temp').track()
const { Directory } = require('pathwatcher')
const GitRepository = require('../src/git-repository')
const GitRepositoryProvider = require('../src/git-repository-provider')
const { it, fit, ffit, fffit, beforeEach } = require('./async-spec-helpers')
const { it, beforeEach } = require('./async-spec-helpers')
describe('GitRepositoryProvider', () => {
let provider

View File

@@ -1,11 +1,4 @@
const {
it,
fit,
ffit,
fffit,
beforeEach,
afterEach
} = require('./async-spec-helpers')
const { it, beforeEach, afterEach } = require('./async-spec-helpers')
const path = require('path')
const fs = require('fs-plus')
const temp = require('temp').track()
@@ -424,8 +417,6 @@ describe('GitRepository', () => {
await project2.deserialize(atom.project.serialize({ isUnloading: false }))
buffer = project2.getBuffers()[0]
const originalContent = buffer.getText()
buffer.append('changes')
statusHandler = jasmine.createSpy('statusHandler')

View File

@@ -1,11 +1,4 @@
const {
it,
fit,
ffit,
fffit,
beforeEach,
afterEach
} = require('./async-spec-helpers')
const { it, beforeEach, afterEach } = require('./async-spec-helpers')
const dedent = require('dedent')
const path = require('path')
@@ -307,7 +300,7 @@ describe('GrammarRegistry', () => {
require.resolve('language-javascript/grammars/javascript.cson')
)
const disposable = grammarRegistry.maintainLanguageMode(buffer)
grammarRegistry.maintainLanguageMode(buffer)
expect(retainedBufferCount(grammarRegistry)).toBe(1)
expect(subscriptionCount(grammarRegistry)).toBe(3)

View File

@@ -1,12 +1,4 @@
const {
it,
fit,
ffit,
fffit,
beforeEach,
afterEach
} = require('./async-spec-helpers')
const { Emitter, Disposable, CompositeDisposable } = require('event-kit')
const { it, beforeEach, afterEach } = require('./async-spec-helpers')
const { HistoryManager, HistoryProject } = require('../src/history-manager')
const StateStore = require('../src/state-store')

View File

@@ -8,7 +8,7 @@ const { Disposable } = require('atom')
const { buildKeydownEvent } = require('../src/keymap-extensions')
const { mockLocalStorage } = require('./spec-helper')
const ModuleCache = require('../src/module-cache')
const { it, fit, ffit, beforeEach, afterEach } = require('./async-spec-helpers')
const { it, beforeEach, afterEach } = require('./async-spec-helpers')
describe('PackageManager', () => {
function createTestElement (className) {

View File

@@ -1,15 +1,7 @@
/** @babel */
import fs from 'fs'
import path from 'path'
import {
it,
fit,
ffit,
fffit,
beforeEach,
afterEach
} from './async-spec-helpers'
import { it, beforeEach } from './async-spec-helpers'
import PackageTranspilationRegistry from '../src/package-transpilation-registry'

View File

@@ -1,11 +1,8 @@
const PaneContainer = require('../src/pane-container')
const {
it,
fit,
ffit,
fffit,
beforeEach,
afterEach
beforeEach
} = require('./async-spec-helpers')
describe('PaneContainer', () => {

View File

@@ -5,9 +5,6 @@ const Pane = require('../src/pane')
const PaneContainer = require('../src/pane-container')
const {
it,
fit,
ffit,
fffit,
beforeEach,
conditionPromise,
timeoutPromise

View File

@@ -108,7 +108,7 @@ describe('Panel', () => {
describe('creating an atom-panel via markup', () => {
it('does not throw an error', () => {
const element = document.createElement('atom-panel')
document.createElement('atom-panel')
})
})
})

View File

@@ -1,14 +1,7 @@
/** @babel */
import {
it,
fit,
ffit,
fffit,
beforeEach,
afterEach
} from './async-spec-helpers'
import { Emitter, Disposable, CompositeDisposable } from 'event-kit'
import { it, beforeEach } from './async-spec-helpers'
import { Disposable } from 'event-kit'
const ReopenProjectMenuManager = require('../src/reopen-project-menu-manager')

View File

@@ -1,12 +1,5 @@
/** @babel */
import {
it,
fit,
ffit,
fffit,
beforeEach,
afterEach
} from './async-spec-helpers'
import { it } from './async-spec-helpers'
const StateStore = require('../src/state-store.js')

View File

@@ -152,7 +152,7 @@ describe('StyleManager', () => {
describe('when a sourcePath parameter is specified', () => {
it('ensures a maximum of one style element for the given source path, updating a previous if it exists', () => {
const disposable1 = styleManager.addStyleSheet('a {color: red}', {
styleManager.addStyleSheet('a {color: red}', {
sourcePath: '/foo/bar'
})
expect(addEvents.length).toBe(1)

View File

@@ -1,12 +1,9 @@
const {
it,
fit,
ffit,
fffit,
beforeEach,
afterEach,
conditionPromise,
timeoutPromise
conditionPromise
} = require('./async-spec-helpers')
const Random = require('../script/node_modules/random-seed')
@@ -194,7 +191,7 @@ describe('TextEditorComponent', () => {
})
it('re-renders lines when their height changes', async () => {
const { component, element, editor } = buildComponent({
const { component, element } = buildComponent({
rowsPerTile: 3,
autoHeight: false
})
@@ -235,7 +232,7 @@ describe('TextEditorComponent', () => {
})
it('makes the content at least as tall as the scroll container client height', async () => {
const { component, element, editor } = buildComponent({
const { component, editor } = buildComponent({
text: 'a'.repeat(100),
width: 50,
height: 100
@@ -253,11 +250,10 @@ describe('TextEditorComponent', () => {
})
it('honors the scrollPastEnd option by adding empty space equivalent to the clientHeight to the end of the content area', async () => {
const { component, element, editor } = buildComponent({
const { component, editor } = buildComponent({
autoHeight: false,
autoWidth: false
})
const { scrollContainer } = component.refs
await editor.update({ scrollPastEnd: true })
await setEditorHeightInLines(component, 6)
@@ -307,7 +303,7 @@ describe('TextEditorComponent', () => {
})
it('gives the line number tiles an explicit width and height so their layout can be strictly contained', async () => {
const { component, element, editor } = buildComponent({ rowsPerTile: 3 })
const { component, editor } = buildComponent({ rowsPerTile: 3 })
const lineNumberGutterElement =
component.refs.gutterContainer.refs.lineNumberGutter.element
@@ -344,7 +340,7 @@ describe('TextEditorComponent', () => {
})
it('keeps the number of tiles stable when the visible line count changes during vertical scrolling', async () => {
const { component, element, editor } = buildComponent({
const { component } = buildComponent({
rowsPerTile: 3,
autoHeight: false
})
@@ -359,7 +355,7 @@ describe('TextEditorComponent', () => {
})
it('recycles tiles on resize', async () => {
const { component, element, editor } = buildComponent({
const { component } = buildComponent({
rowsPerTile: 2,
autoHeight: false
})
@@ -371,7 +367,7 @@ describe('TextEditorComponent', () => {
})
it("updates lines numbers when a row's foldability changes (regression)", async () => {
const { component, element, editor } = buildComponent({ text: 'abc\n' })
const { component, editor } = buildComponent({ text: 'abc\n' })
editor.setCursorBufferPosition([1, 0])
await component.getNextUpdatePromise()
expect(
@@ -392,7 +388,7 @@ describe('TextEditorComponent', () => {
})
it('shows the foldable icon on the last screen row of a buffer row that can be folded', async () => {
const { component, element, editor } = buildComponent({
const { component } = buildComponent({
text: 'abc\n de\nfghijklm\n no',
softWrapped: true
})
@@ -415,7 +411,7 @@ describe('TextEditorComponent', () => {
})
it('renders dummy vertical and horizontal scrollbars when content overflows', async () => {
const { component, element, editor } = buildComponent({
const { component, editor } = buildComponent({
height: 100,
width: 100
})
@@ -708,7 +704,7 @@ describe('TextEditorComponent', () => {
})
it('places the hidden input element at the location of the last cursor if it is visible', async () => {
const { component, element, editor } = buildComponent({
const { component, editor } = buildComponent({
height: 60,
width: 120,
rowsPerTile: 2
@@ -789,7 +785,7 @@ describe('TextEditorComponent', () => {
})
it('decorates the line numbers of folded lines', async () => {
const { component, element, editor } = buildComponent()
const { component, editor } = buildComponent()
editor.foldBufferRow(1)
await component.getNextUpdatePromise()
expect(
@@ -799,7 +795,7 @@ describe('TextEditorComponent', () => {
it('makes lines at least as wide as the scrollContainer', async () => {
const { component, element, editor } = buildComponent()
const { scrollContainer, gutterContainer } = component.refs
const { scrollContainer } = component.refs
editor.setText('a')
await component.getNextUpdatePromise()
@@ -815,7 +811,6 @@ describe('TextEditorComponent', () => {
})
const editorPadding = 3
element.style.padding = editorPadding + 'px'
const { gutterContainer, scrollContainer } = component.refs
const initialWidth = element.offsetWidth
const initialHeight = element.offsetHeight
expect(initialWidth).toBe(
@@ -854,7 +849,7 @@ describe('TextEditorComponent', () => {
})
it('does not render the line number gutter at all if the isLineNumberGutterVisible parameter is false', () => {
const { component, element, editor } = buildComponent({
const { element } = buildComponent({
lineNumberGutterVisible: false
})
expect(element.querySelector('.line-number')).toBe(null)
@@ -1063,7 +1058,7 @@ describe('TextEditorComponent', () => {
it('does not blow away class names added to the element by packages when changing the class name', async () => {
assertDocumentFocused()
const { component, element, editor } = buildComponent()
const { component, element } = buildComponent()
element.classList.add('a', 'b')
expect(element.className).toBe('editor a b')
element.focus()
@@ -1076,7 +1071,7 @@ describe('TextEditorComponent', () => {
it('does not blow away class names managed by the component when packages change the element class name', async () => {
assertDocumentFocused()
const { component, element, editor } = buildComponent({ mini: true })
const { component, element } = buildComponent({ mini: true })
element.classList.add('a', 'b')
element.focus()
await component.getNextUpdatePromise()
@@ -1087,7 +1082,7 @@ describe('TextEditorComponent', () => {
})
it('ignores resize events when the editor is hidden', async () => {
const { component, element, editor } = buildComponent({
const { component, element } = buildComponent({
autoHeight: false
})
element.style.height = 5 * component.getLineHeight() + 'px'
@@ -1258,13 +1253,13 @@ describe('TextEditorComponent', () => {
describe('mini editors', () => {
it('adds the mini attribute and class even when the element is not attached', () => {
{
const { element, editor } = buildComponent({ mini: true })
const { element } = buildComponent({ mini: true })
expect(element.hasAttribute('mini')).toBe(true)
expect(element.classList.contains('mini')).toBe(true)
}
{
const { element, editor } = buildComponent({
const { element } = buildComponent({
mini: true,
attach: false
})
@@ -1274,7 +1269,7 @@ describe('TextEditorComponent', () => {
})
it('does not render the gutter container', () => {
const { component, element, editor } = buildComponent({ mini: true })
const { component, element } = buildComponent({ mini: true })
expect(component.refs.gutterContainer).toBeUndefined()
expect(element.querySelector('gutter-container')).toBeNull()
})
@@ -1299,7 +1294,7 @@ describe('TextEditorComponent', () => {
})
it('does not render scrollbars', async () => {
const { component, element, editor } = buildComponent({
const { component, editor } = buildComponent({
mini: true,
autoHeight: false
})
@@ -1321,7 +1316,7 @@ describe('TextEditorComponent', () => {
})
it('focuses the hidden input element and adds the is-focused class when focused', async () => {
const { component, element, editor } = buildComponent()
const { component, element } = buildComponent()
const { hiddenInput } = component.refs.cursorsAndInput.refs
expect(document.activeElement).not.toBe(hiddenInput)
@@ -1341,7 +1336,7 @@ describe('TextEditorComponent', () => {
})
it('updates the component when the hidden input is focused directly', async () => {
const { component, element, editor } = buildComponent()
const { component, element } = buildComponent()
const { hiddenInput } = component.refs.cursorsAndInput.refs
expect(element.classList.contains('is-focused')).toBe(false)
expect(document.activeElement).not.toBe(hiddenInput)
@@ -1352,7 +1347,7 @@ describe('TextEditorComponent', () => {
})
it('gracefully handles a focus event that occurs prior to the attachedCallback of the element', () => {
const { component, element, editor } = buildComponent({ attach: false })
const { component, element } = buildComponent({ attach: false })
const parent = document.createElement(
'text-editor-component-test-element'
)
@@ -1365,7 +1360,7 @@ describe('TextEditorComponent', () => {
})
it('gracefully handles a focus event that occurs prior to detecting the element has become visible', async () => {
const { component, element, editor } = buildComponent({ attach: false })
const { component, element } = buildComponent({ attach: false })
element.style.display = 'none'
jasmine.attachToDOM(element)
element.style.display = 'block'
@@ -1475,7 +1470,6 @@ describe('TextEditorComponent', () => {
it('automatically scrolls horizontally when the requested range is within the horizontal scroll margin of the right edge of the gutter or right edge of the scroll container', async () => {
const { component, element, editor } = buildComponent()
const { scrollContainer } = component.refs
element.style.width =
component.getGutterContainerWidth() +
3 *
@@ -1560,7 +1554,6 @@ describe('TextEditorComponent', () => {
const { component, element, editor } = buildComponent({
autoHeight: false
})
const { scrollContainer } = component.refs
element.style.height = component.getContentHeight() / 2 + 'px'
element.style.width = component.getScrollWidth() + 'px'
await component.getNextUpdatePromise()
@@ -1587,7 +1580,7 @@ describe('TextEditorComponent', () => {
describe('logical scroll positions', () => {
it('allows the scrollTop to be changed and queried in terms of rows via setScrollTopRow and getScrollTopRow', () => {
const { component, element, editor } = buildComponent({
const { component, element } = buildComponent({
attach: false,
height: 80
})
@@ -1682,7 +1675,7 @@ describe('TextEditorComponent', () => {
describe('scrolling via the mouse wheel', () => {
it('scrolls vertically or horizontally depending on whether deltaX or deltaY is larger', () => {
const scrollSensitivity = 30
const { component, editor } = buildComponent({
const { component } = buildComponent({
height: 50,
width: 50,
scrollSensitivity
@@ -1737,7 +1730,7 @@ describe('TextEditorComponent', () => {
it('inverts deltaX and deltaY when holding shift on Windows and Linux', async () => {
const scrollSensitivity = 50
const { component, editor } = buildComponent({
const { component } = buildComponent({
height: 50,
width: 50,
scrollSensitivity
@@ -1864,7 +1857,7 @@ describe('TextEditorComponent', () => {
describe('scrolling via the API', () => {
it('ignores scroll requests to NaN, null or undefined positions', async () => {
const { component, element, editor } = buildComponent({
const { component } = buildComponent({
rowsPerTile: 2,
autoHeight: false
})
@@ -1901,7 +1894,7 @@ describe('TextEditorComponent', () => {
describe('line and line number decorations', () => {
it('adds decoration classes on screen lines spanned by decorated markers', async () => {
const { component, element, editor } = buildComponent({
const { component, editor } = buildComponent({
softWrapped: true
})
await setEditorWidthInCharacters(component, 55)
@@ -1914,10 +1907,10 @@ describe('TextEditorComponent', () => {
const marker1 = editor.markScreenRange([[1, 10], [3, 10]])
const layer = editor.addMarkerLayer()
const marker2 = layer.markScreenPosition([5, 0])
const marker3 = layer.markScreenPosition([8, 0])
layer.markScreenPosition([5, 0])
layer.markScreenPosition([8, 0])
const marker4 = layer.markScreenPosition([10, 0])
const markerDecoration = editor.decorateMarker(marker1, {
editor.decorateMarker(marker1, {
type: ['line', 'line-number'],
class: 'a'
})
@@ -2048,7 +2041,7 @@ describe('TextEditorComponent', () => {
})
it('honors the onlyEmpty and onlyNonEmpty decoration options', async () => {
const { component, element, editor } = buildComponent()
const { component, editor } = buildComponent()
const marker = editor.markScreenPosition([1, 0])
editor.decorateMarker(marker, {
type: ['line', 'line-number'],
@@ -2121,7 +2114,7 @@ describe('TextEditorComponent', () => {
})
it('honors the onlyHead option', async () => {
const { component, element, editor } = buildComponent()
const { component, editor } = buildComponent()
const marker = editor.markScreenRange([[1, 4], [3, 4]])
editor.decorateMarker(marker, {
type: ['line', 'line-number'],
@@ -2145,7 +2138,7 @@ describe('TextEditorComponent', () => {
})
it('only decorates the last row of non-empty ranges that end at column 0 if omitEmptyLastRow is false', async () => {
const { component, element, editor } = buildComponent()
const { component, editor } = buildComponent()
const marker = editor.markScreenRange([[1, 0], [3, 0]])
editor.decorateMarker(marker, {
type: ['line', 'line-number'],
@@ -2180,7 +2173,7 @@ describe('TextEditorComponent', () => {
})
it('does not decorate invalidated markers', async () => {
const { component, element, editor } = buildComponent()
const { component, editor } = buildComponent()
const marker = editor.markScreenRange([[1, 0], [3, 0]], {
invalidate: 'touch'
})
@@ -2533,7 +2526,7 @@ describe('TextEditorComponent', () => {
}
it('renders overlay elements at the specified screen position unless it would overflow the window', async () => {
const { component, element, editor } = buildComponent({
const { component, editor } = buildComponent({
width: 200,
height: 100,
attach: false
@@ -2634,7 +2627,7 @@ describe('TextEditorComponent', () => {
})
it('does not attempt to avoid overflowing the window if `avoidOverflow` is false on the decoration', async () => {
const { component, element, editor } = buildComponent({
const { component, editor } = buildComponent({
width: 200,
height: 100,
attach: false
@@ -2646,7 +2639,7 @@ describe('TextEditorComponent', () => {
overlayElement.style.margin = '3px'
overlayElement.style.backgroundColor = 'red'
const marker = editor.markScreenPosition([4, 25])
const decoration = editor.decorateMarker(marker, {
editor.decorateMarker(marker, {
type: 'overlay',
item: overlayElement,
avoidOverflow: false
@@ -2666,7 +2659,7 @@ describe('TextEditorComponent', () => {
describe('custom gutter decorations', () => {
it('arranges custom gutters based on their priority', async () => {
const { component, element, editor } = buildComponent()
const { component, editor } = buildComponent()
editor.addGutter({ name: 'e', priority: 2 })
editor.addGutter({ name: 'a', priority: -2 })
editor.addGutter({ name: 'd', priority: 1 })
@@ -2683,7 +2676,7 @@ describe('TextEditorComponent', () => {
})
it('adjusts the left edge of the scroll container based on changes to the gutter container width', async () => {
const { component, element, editor } = buildComponent()
const { component, editor } = buildComponent()
const { scrollContainer, gutterContainer } = component.refs
function checkScrollContainerLeft () {
@@ -2740,7 +2733,7 @@ describe('TextEditorComponent', () => {
})
it('can show and hide custom gutters', async () => {
const { component, element, editor } = buildComponent()
const { component, editor } = buildComponent()
const gutterA = editor.addGutter({ name: 'a', priority: -1 })
const gutterB = editor.addGutter({ name: 'b', priority: 1 })
const gutterAElement = gutterA.getElement()
@@ -2978,25 +2971,16 @@ describe('TextEditorComponent', () => {
height: 33,
position: 'before'
})
const {
item: item4,
decoration: decoration4
} = createBlockDecorationAtScreenRow(editor, 7, {
const { item: item4 } = createBlockDecorationAtScreenRow(editor, 7, {
height: 44,
position: 'before'
})
const {
item: item5,
decoration: decoration5
} = createBlockDecorationAtScreenRow(editor, 7, {
const { item: item5 } = createBlockDecorationAtScreenRow(editor, 7, {
height: 50,
marginBottom: 5,
position: 'after'
})
const {
item: item6,
decoration: decoration6
} = createBlockDecorationAtScreenRow(editor, 12, {
const { item: item6 } = createBlockDecorationAtScreenRow(editor, 12, {
height: 60,
marginTop: 6,
position: 'after'
@@ -3343,7 +3327,7 @@ describe('TextEditorComponent', () => {
})
it('correctly positions line numbers when block decorations are located at tile boundaries', async () => {
const { editor, component, element } = buildComponent({ rowsPerTile: 3 })
const { editor, component } = buildComponent({ rowsPerTile: 3 })
createBlockDecorationAtScreenRow(editor, 0, {
height: 5,
position: 'before'
@@ -3378,7 +3362,7 @@ describe('TextEditorComponent', () => {
})
it('removes block decorations whose markers have been destroyed', async () => {
const { editor, component, element } = buildComponent({ rowsPerTile: 3 })
const { editor, component } = buildComponent({ rowsPerTile: 3 })
const { marker } = createBlockDecorationAtScreenRow(editor, 2, {
height: 5,
position: 'before'
@@ -3408,7 +3392,7 @@ describe('TextEditorComponent', () => {
3,
{ height: 44, position: 'before', invalidate: 'touch' }
)
const { component, element } = buildComponent({ editor, rowsPerTile: 3 })
const { component } = buildComponent({ editor, rowsPerTile: 3 })
// Invalidating the marker removes the block decoration.
editor.getBuffer().deleteRows(2, 3)
@@ -3460,7 +3444,7 @@ describe('TextEditorComponent', () => {
it('does not render block decorations when decorating invalid markers', async () => {
const editor = buildEditor({ rowsPerTile: 3, autoHeight: false })
const { component, element } = buildComponent({ editor, rowsPerTile: 3 })
const { component } = buildComponent({ editor, rowsPerTile: 3 })
const marker = editor.markScreenPosition([3, 0], { invalidate: 'touch' })
const item = document.createElement('div')
@@ -3468,7 +3452,7 @@ describe('TextEditorComponent', () => {
item.style.width = 30 + 'px'
editor.getBuffer().deleteRows(1, 4)
const decoration = editor.decorateMarker(marker, {
editor.decorateMarker(marker, {
type: 'block',
item,
position: 'before'
@@ -3498,12 +3482,11 @@ describe('TextEditorComponent', () => {
it('does not try to remeasure block decorations whose markers are invalid (regression)', async () => {
const editor = buildEditor({ rowsPerTile: 3, autoHeight: false })
const { component, element } = buildComponent({ editor, rowsPerTile: 3 })
const { decoration, marker } = createBlockDecorationAtScreenRow(
editor,
2,
{ height: '12px', invalidate: 'touch' }
)
const { component } = buildComponent({ editor, rowsPerTile: 3 })
createBlockDecorationAtScreenRow(editor, 2, {
height: '12px',
invalidate: 'touch'
})
editor.getBuffer().deleteRows(0, 3)
await component.getNextUpdatePromise()
@@ -3579,7 +3562,7 @@ describe('TextEditorComponent', () => {
const marker = editor.markScreenPosition([0, 0])
const item = document.createElement('div')
item.textContent = 'block decoration'
const decoration = editor.decorateMarker(marker, {
editor.decorateMarker(marker, {
type: 'block',
item
})
@@ -3596,7 +3579,7 @@ describe('TextEditorComponent', () => {
const marker = editor.markScreenPosition([0, 0])
const item = document.createElement('div')
item.textContent = 'block decoration that could wrap many times'
const decoration = editor.decorateMarker(marker, {
editor.decorateMarker(marker, {
type: 'block',
item
})
@@ -3685,7 +3668,7 @@ describe('TextEditorComponent', () => {
return lists
}, [[], []])
const [afterItems, afterDecorations] = [undefined, 1, 6, undefined, 6, 2]
const [afterItems] = [undefined, 1, 6, undefined, 6, 2]
.map(order => {
return createBlockDecorationAtScreenRow(editor, 2, {
height: 10,
@@ -3986,7 +3969,7 @@ describe('TextEditorComponent', () => {
})
it('does not create empty text nodes when a text decoration ends right after a text tag', async () => {
const { component, element, editor } = buildComponent()
const { component, editor } = buildComponent()
const marker = editor.markBufferRange([[0, 8], [0, 29]])
editor.decorateMarker(marker, { type: 'text', class: 'a' })
await component.getNextUpdatePromise()
@@ -4009,7 +3992,7 @@ describe('TextEditorComponent', () => {
describe('when there is only one cursor', () => {
it('positions the cursor on single-click or when middle-clicking', async () => {
for (const button of [0, 1]) {
const { component, element, editor } = buildComponent()
const { component, editor } = buildComponent()
const { lineHeight } = component.measurements
editor.setCursorScreenPosition([Infinity, Infinity], {
@@ -4319,7 +4302,7 @@ describe('TextEditorComponent', () => {
})
it('expands the last selection on shift-click', () => {
const { component, element, editor } = buildComponent()
const { component, editor } = buildComponent()
editor.setCursorScreenPosition([2, 18], { autoscroll: false })
component.didMouseDownOnContent(
@@ -4493,8 +4476,7 @@ describe('TextEditorComponent', () => {
)
const {
didDrag,
didStopDragging
didDrag
} = component.handleMouseDragUntilMouseUp.argsForCall[1][0]
didDrag(clientPositionForCharacter(component, 0, 8))
expect(editor.getSelectedScreenRange()).toEqual([[0, 4], [1, 5]])
@@ -4522,8 +4504,7 @@ describe('TextEditorComponent', () => {
)
const {
didDrag,
didStopDragging
didDrag
} = component.handleMouseDragUntilMouseUp.argsForCall[2][0]
didDrag(clientPositionForCharacter(component, 1, 8))
expect(editor.getSelectedScreenRange()).toEqual([[1, 0], [3, 0]])
@@ -4554,7 +4535,7 @@ describe('TextEditorComponent', () => {
})
it('autoscrolls the content when dragging near the edge of the scroll container', async () => {
const { component, element, editor } = buildComponent({
const { component } = buildComponent({
width: 200,
height: 200
})
@@ -4585,8 +4566,7 @@ describe('TextEditorComponent', () => {
clientY: 100
})
const {
didDrag,
didStopDragging
didDrag
} = component.handleMouseDragUntilMouseUp.argsForCall[0][0]
didDrag({ clientX: 199, clientY: 199 })
@@ -4914,11 +4894,10 @@ describe('TextEditorComponent', () => {
})
it('autoscrolls when dragging near the top or bottom of the gutter', async () => {
const { component, editor } = buildComponent({
const { component } = buildComponent({
width: 200,
height: 200
})
const { scrollContainer } = component.refs
spyOn(component, 'handleMouseDragUntilMouseUp')
let previousScrollTop = 0
@@ -4944,8 +4923,7 @@ describe('TextEditorComponent', () => {
clientY: 100
})
const {
didDrag,
didStopDragging
didDrag
} = component.handleMouseDragUntilMouseUp.argsForCall[0][0]
didDrag({ clientX: 199, clientY: 199 })
assertScrolledDown()
@@ -4995,7 +4973,7 @@ describe('TextEditorComponent', () => {
describe('on the scrollbars', () => {
it('delegates the mousedown events to the parent component unless the mousedown was on the actual scrollbar', async () => {
const { component, element, editor } = buildComponent({ height: 100 })
const { component, editor } = buildComponent({ height: 100 })
await setEditorWidthInCharacters(component, 6)
const verticalScrollbar = component.refs.verticalScrollbar
@@ -5055,7 +5033,7 @@ describe('TextEditorComponent', () => {
describe('keyboard input', () => {
it('handles inserted accented characters via the press-and-hold menu on macOS correctly', () => {
const { editor, component, element } = buildComponent({
const { editor, component } = buildComponent({
text: '',
chromeVersion: 57
})
@@ -5417,7 +5395,7 @@ describe('TextEditorComponent', () => {
})
it('maintains the scrollTopRow and scrollLeftColumn when the font size changes', async () => {
const { component, element, editor } = buildComponent({
const { component, element } = buildComponent({
rowsPerTile: 1,
autoHeight: false
})
@@ -5440,7 +5418,7 @@ describe('TextEditorComponent', () => {
})
it('gracefully handles the editor being hidden after a styling change', async () => {
const { component, element, editor } = buildComponent({
const { component, element } = buildComponent({
autoHeight: false
})
element.style.fontSize =
@@ -5527,7 +5505,7 @@ describe('TextEditorComponent', () => {
})
it('does not throw an exception on attachment when setting the soft-wrap column', () => {
const { component, element, editor } = buildComponent({
const { element, editor } = buildComponent({
width: 435,
attach: false,
updatedSynchronously: true
@@ -5565,7 +5543,7 @@ describe('TextEditorComponent', () => {
describe('pixelPositionForScreenPosition(point)', () => {
it('returns the pixel position for the given point, regardless of whether or not it is currently on screen', async () => {
const { component, element, editor } = buildComponent({
const { component, editor } = buildComponent({
rowsPerTile: 2,
autoHeight: false
})
@@ -5636,7 +5614,7 @@ describe('TextEditorComponent', () => {
})
it('does not get the component into an inconsistent state when the model has unflushed changes (regression)', async () => {
const { component, element, editor } = buildComponent({
const { component, editor } = buildComponent({
rowsPerTile: 2,
autoHeight: false,
text: ''
@@ -5649,12 +5627,12 @@ describe('TextEditorComponent', () => {
})
it('does not shift cursors downward or render off-screen content when measuring off-screen lines (regression)', async () => {
const { component, element, editor } = buildComponent({
const { component, element } = buildComponent({
rowsPerTile: 2,
autoHeight: false
})
await setEditorHeightInLines(component, 3)
const { top, left } = component.pixelPositionForScreenPosition({
component.pixelPositionForScreenPosition({
row: 12,
column: 1
})
@@ -5679,7 +5657,7 @@ describe('TextEditorComponent', () => {
describe('screenPositionForPixelPosition', () => {
it('returns the screen position for the given pixel position, regardless of whether or not it is currently on screen', async () => {
const { component, element, editor } = buildComponent({
const { component, editor } = buildComponent({
rowsPerTile: 2,
autoHeight: false
})
@@ -5749,7 +5727,7 @@ describe('TextEditorComponent', () => {
describe('model methods that delegate to the component / element', () => {
it('delegates setHeight and getHeight to the component', async () => {
const { component, element, editor } = buildComponent({
const { component, editor } = buildComponent({
autoHeight: false
})
spyOn(Grim, 'deprecate')
@@ -5763,7 +5741,7 @@ describe('TextEditorComponent', () => {
})
it('delegates setWidth and getWidth to the component', async () => {
const { component, element, editor } = buildComponent()
const { component, editor } = buildComponent()
spyOn(Grim, 'deprecate')
expect(editor.getWidth()).toBe(component.getScrollContainerWidth())
expect(Grim.deprecate.callCount).toBe(1)
@@ -6138,10 +6116,6 @@ function getElementHeight (element) {
return height
}
function getNextTickPromise () {
return new Promise(resolve => process.nextTick(resolve))
}
function queryOnScreenLineNumberElements (element) {
return Array.from(element.querySelectorAll('.line-number:not(.dummy)'))
}

View File

@@ -1,12 +1,7 @@
const {
it,
fit,
ffit,
fffit,
beforeEach,
afterEach,
conditionPromise,
timeoutPromise
beforeEach
} = require('./async-spec-helpers')
const TextEditor = require('../src/text-editor')
const TextEditorElement = require('../src/text-editor-element')

View File

@@ -2,7 +2,7 @@ const TextEditorRegistry = require('../src/text-editor-registry')
const TextEditor = require('../src/text-editor')
const TextBuffer = require('text-buffer')
const { Point, Range } = TextBuffer
const { it, fit, ffit, fffit } = require('./async-spec-helpers')
const { it } = require('./async-spec-helpers')
const dedent = require('dedent')
describe('TextEditorRegistry', function () {
@@ -287,7 +287,6 @@ describe('TextEditorRegistry', function () {
atom.grammars.assignLanguageMode(editor, 'source.js')
atom.config.set('editor.tabType', 'auto')
await initialPackageActivation
const languageMode = editor.getBuffer().getLanguageMode()
editor.setText(dedent`
{

View File

@@ -1,12 +1,8 @@
const {
it,
fit,
ffit,
fffit,
beforeEach,
afterEach,
conditionPromise,
timeoutPromise
afterEach
} = require('./async-spec-helpers')
const fs = require('fs')
@@ -384,7 +380,7 @@ describe('TextEditor', () => {
it('merges multiple cursors', () => {
editor.setCursorScreenPosition([0, 0])
editor.addCursorAtScreenPosition([0, 1])
const [cursor1, cursor2] = editor.getCursors()
const [cursor1] = editor.getCursors()
editor.setCursorScreenPosition([4, 7])
expect(editor.getCursors().length).toBe(1)
expect(editor.getCursors()).toEqual([cursor1])
@@ -450,7 +446,7 @@ describe('TextEditor', () => {
it('merges cursors when they overlap', () => {
editor.addCursorAtScreenPosition([1, 0])
const [cursor1, cursor2] = editor.getCursors()
const [cursor1] = editor.getCursors()
editor.moveUp()
expect(editor.getCursors()).toEqual([cursor1])
@@ -551,7 +547,7 @@ describe('TextEditor', () => {
it('merges cursors when they overlap', () => {
editor.setCursorScreenPosition([12, 2])
editor.addCursorAtScreenPosition([11, 2])
const [cursor1, cursor2] = editor.getCursors()
const [cursor1] = editor.getCursors()
editor.moveDown()
expect(editor.getCursors()).toEqual([cursor1])
@@ -668,7 +664,7 @@ describe('TextEditor', () => {
editor.setCursorScreenPosition([0, 0])
editor.addCursorAtScreenPosition([0, 1])
const [cursor1, cursor2] = editor.getCursors()
const [cursor1] = editor.getCursors()
editor.moveLeft()
expect(editor.getCursors()).toEqual([cursor1])
expect(cursor1.getBufferPosition()).toEqual([0, 0])
@@ -754,7 +750,7 @@ describe('TextEditor', () => {
it('merges cursors when they overlap', () => {
editor.setCursorScreenPosition([12, 2])
editor.addCursorAtScreenPosition([12, 1])
const [cursor1, cursor2] = editor.getCursors()
const [cursor1] = editor.getCursors()
editor.moveRight()
expect(editor.getCursors()).toEqual([cursor1])
@@ -1501,8 +1497,9 @@ describe('TextEditor', () => {
describe('::getCursorScreenPositions()', () => {
it('returns the cursor positions in the order they were added', () => {
editor.foldBufferRow(4)
const cursor1 = editor.addCursorAtBufferPosition([8, 5])
const cursor2 = editor.addCursorAtBufferPosition([3, 5])
editor.addCursorAtBufferPosition([8, 5])
editor.addCursorAtBufferPosition([3, 5])
expect(editor.getCursorScreenPositions()).toEqual([
[0, 0],
[5, 5],
@@ -1643,7 +1640,7 @@ describe('TextEditor', () => {
[[1, 10], [1, 20]],
[[2, 15], [3, 25]]
])
const [selection1, selection2, selection3] = editor.getSelections()
const [selection1] = editor.getSelections()
editor.selectDown()
expect(editor.getSelections()).toEqual([selection1])
@@ -1656,7 +1653,7 @@ describe('TextEditor', () => {
[[[0, 9], [0, 13]], [[1, 10], [1, 20]]],
{ reversed: true }
)
const [selection1, selection2] = editor.getSelections()
const [selection1] = editor.getSelections()
editor.selectUp()
expect(editor.getSelections().length).toBe(1)
@@ -1670,7 +1667,7 @@ describe('TextEditor', () => {
[[[0, 9], [0, 13]], [[0, 13], [1, 20]]],
{ reversed: true }
)
const [selection1, selection2] = editor.getSelections()
const [selection1] = editor.getSelections()
editor.selectLeft()
expect(editor.getSelections()).toEqual([selection1])
@@ -1680,7 +1677,7 @@ describe('TextEditor', () => {
it('merges selections when they intersect when moving right', () => {
editor.setSelectedBufferRanges([[[0, 9], [0, 14]], [[0, 14], [1, 20]]])
const [selection1, selection2] = editor.getSelections()
const [selection1] = editor.getSelections()
editor.selectRight()
expect(editor.getSelections()).toEqual([selection1])
@@ -2310,7 +2307,7 @@ describe('TextEditor', () => {
selection = editor.getLastSelection()
editor.setSelectedBufferRanges([[[2, 2], [3, 3]], [[4, 4], [5, 5]]])
const [selection1, selection2] = editor.getSelections()
const [selection1] = editor.getSelections()
expect(selection1).toBe(selection)
expect(selection1.getBufferRange()).toEqual([[2, 2], [3, 3]])
})
@@ -2374,7 +2371,7 @@ describe('TextEditor', () => {
selection = editor.getLastSelection()
editor.setSelectedScreenRanges([[[2, 2], [3, 4]], [[4, 4], [5, 5]]])
const [selection1, selection2] = editor.getSelections()
const [selection1] = editor.getSelections()
expect(selection1).toBe(selection)
expect(selection1.getScreenRange()).toEqual([[2, 2], [3, 4]])
})
@@ -4724,8 +4721,6 @@ describe('TextEditor', () => {
it('deletes as normal', () => {
editor.foldBufferRow(4)
editor.setCursorScreenPosition([3, 4])
const cursorPositionBefore = editor.getCursorScreenPosition()
editor.delete()
expect(buffer.lineForRow(3)).toBe(
@@ -5236,19 +5231,6 @@ describe('TextEditor', () => {
})
describe('.pasteText()', () => {
const copyText = function (text, { startColumn, textEditor } = {}) {
if (startColumn == null) startColumn = 0
if (textEditor == null) textEditor = editor
textEditor.setCursorBufferPosition([0, 0])
textEditor.insertText(text)
const numberOfNewlines = text.match(/\n/g).length
const endColumn = text.match(/[^\n]*$/)[0].length
textEditor
.getLastSelection()
.setBufferRange([[0, startColumn], [numberOfNewlines, endColumn]])
return textEditor.cutSelectedText()
}
it('pastes text into the buffer', () => {
editor.setSelectedBufferRanges([[[0, 4], [0, 13]], [[1, 6], [1, 10]]])
atom.clipboard.write('first')
@@ -5854,7 +5836,6 @@ describe('TextEditor', () => {
editor.delete()
editor.delete()
const selections = editor.getSelections()
expect(buffer.lineForRow(1)).toBe(' var = function( {')
expect(editor.getSelectedBufferRanges()).toEqual([
@@ -6108,7 +6089,7 @@ describe('TextEditor', () => {
editor.addCursorAtScreenPosition([0, 2])
editor.addCursorAtScreenPosition([1, 2])
const [cursor1, cursor2, cursor3] = editor.getCursors()
const [cursor1, , cursor3] = editor.getCursors()
expect(editor.getCursors().length).toBe(3)
buffer.delete([[0, 0], [0, 2]])
@@ -7874,11 +7855,8 @@ describe('TextEditor', () => {
it("does not throw errors after the marker's containing layer is destroyed", () => {
const layer = editor.addMarkerLayer()
const marker = layer.markBufferRange([[2, 4], [6, 8]])
const decoration = editor.decorateMarker(marker, {
type: 'highlight',
class: 'foo'
})
layer.markBufferRange([[2, 4], [6, 8]])
layer.destroy()
editor.decorationsStateForScreenRowRange(0, 5)
})

View File

@@ -1,17 +1,10 @@
const NullGrammar = require('../src/null-grammar')
const TextMateLanguageMode = require('../src/text-mate-language-mode')
const TextBuffer = require('text-buffer')
const { Point, Range } = TextBuffer
const { Point } = TextBuffer
const _ = require('underscore-plus')
const dedent = require('dedent')
const {
it,
fit,
ffit,
fffit,
beforeEach,
afterEach
} = require('./async-spec-helpers')
const { it, beforeEach, afterEach } = require('./async-spec-helpers')
describe('TextMateLanguageMode', () => {
let languageMode, buffer, config

View File

@@ -1,11 +1,4 @@
const {
it,
fit,
ffit,
fffit,
beforeEach,
afterEach
} = require('./async-spec-helpers')
const { it, beforeEach, afterEach } = require('./async-spec-helpers')
const fs = require('fs')
const path = require('path')

View File

@@ -1,14 +1,7 @@
/** @babel */
/* eslint-env jasmine */
import {
it,
fit,
ffit,
fffit,
beforeEach,
afterEach
} from './async-spec-helpers'
import { it, beforeEach, afterEach } from './async-spec-helpers'
import path from 'path'
import childProcess from 'child_process'
import {
@@ -16,7 +9,6 @@ import {
shouldGetEnvFromShell
} from '../src/update-process-env'
import dedent from 'dedent'
import { EventEmitter } from 'events'
import mockSpawn from 'mock-spawn'
const temp = require('temp').track()

View File

@@ -2,14 +2,7 @@
const TextEditor = require('../src/text-editor')
import {
it,
fit,
ffit,
fffit,
beforeEach,
afterEach
} from './async-spec-helpers'
import { it } from './async-spec-helpers'
describe('WorkspaceCenter', () => {
describe('.observeTextEditors()', () => {

View File

@@ -5,14 +5,7 @@ const etch = require('etch')
const path = require('path')
const temp = require('temp').track()
const { Disposable } = require('event-kit')
const {
it,
fit,
ffit,
fffit,
beforeEach,
afterEach
} = require('./async-spec-helpers')
const { it, beforeEach, afterEach } = require('./async-spec-helpers')
const getNextUpdatePromise = () => etch.getScheduler().nextUpdatePromise
@@ -62,7 +55,6 @@ describe('WorkspaceElement', () => {
pane6,
pane7,
pane8,
pane9,
leftDockPane,
rightDockPane,
bottomDockPane,
@@ -104,7 +96,7 @@ describe('WorkspaceElement', () => {
pane6 = pane5.splitRight()
pane8 = pane7.splitRight()
pane9 = pane8.splitRight()
pane8.splitRight()
const leftDock = workspace.getLeftDock()
const rightDock = workspace.getRightDock()

View File

@@ -12,9 +12,6 @@ const fs = require('fs-plus')
const AtomEnvironment = require('../src/atom-environment')
const {
it,
fit,
ffit,
fffit,
beforeEach,
afterEach,
conditionPromise
@@ -1844,9 +1841,6 @@ describe('Workspace', () => {
workspace.observeActiveTextEditor(editor => observed.push(editor))
const editorAddedAfterRegisteringObserver = new TextEditor()
const nonEditorItemAddedAfterRegisteringObserver = document.createElement(
'div'
)
pane.activateItem(editorAddedAfterRegisteringObserver)
expect(observed).toEqual([
@@ -1904,7 +1898,7 @@ describe('Workspace', () => {
const nonEditorItem1 = document.createElement('div')
const nonEditorItem2 = document.createElement('div')
pane.activateItem(nonEditorItem1)
pane.activateItem(nonEditorItem1)
pane.activateItem(nonEditorItem2)
expect(observed).toEqual([])
})