Skip to content

Commit d11f1fe

Browse files
committed
Fix spec suit
- `loadPackage()` only loads the keymaps, menus, stylesheets, etc. To load the mainModule `.requireMainModule()` has to be called. - The css class `.completion-label` was renamed to `.right-label`. - Set the config in one place. - Set minimumWordLength config in advanced for #101.
1 parent ed62b05 commit d11f1fe

File tree

3 files changed

+43
-14
lines changed

3 files changed

+43
-14
lines changed

spec/autocomplete-paths-spec.coffee

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,32 @@ path = require('path')
33
describe 'Autocomplete Snippets', ->
44
[workspaceElement, completionDelay, editor, editorView, pathsMain, autocompleteMain, autocompleteManager] = []
55

6+
testConfig = {
7+
"autocomplete-plus.enableAutoActivation": true
8+
"autocomplete-plus.minimumWordLength": -1
9+
"autocomplete-plus.autoActivationDelay": 100
10+
}
11+
612
beforeEach ->
713
runs ->
8-
# Set to live completion
9-
atom.config.set('autocomplete-plus.enableAutoActivation', true)
10-
# Set the completion delay
14+
Object.keys(testConfig).forEach (key) ->
15+
atom.config.set(key, testConfig[key])
16+
1117
completionDelay = 100
12-
atom.config.set('autocomplete-plus.autoActivationDelay', completionDelay)
1318
completionDelay += 100 # Rendering delay
1419
workspaceElement = atom.views.getView(atom.workspace)
1520
jasmine.attachToDOM(workspaceElement)
16-
autocompleteMain = atom.packages.loadPackage('autocomplete-plus').mainModule
21+
22+
autocompletePlusPkg = atom.packages.loadPackage 'autocomplete-plus'
23+
autocompletePlusPkg.requireMainModule()
24+
autocompleteMain = autocompletePlusPkg.mainModule
25+
1726
spyOn(autocompleteMain, 'consumeProvider').andCallThrough()
18-
pathsMain = atom.packages.loadPackage('autocomplete-paths').mainModule
27+
28+
pathPkg = atom.packages.loadPackage('autocomplete-paths')
29+
pathPkg.requireMainModule()
30+
pathsMain = pathPkg.mainModule
31+
1932
spyOn(pathsMain, 'provide').andCallThrough()
2033

2134
waitsForPromise ->
@@ -72,8 +85,8 @@ describe 'Autocomplete Snippets', ->
7285

7386
runs ->
7487
expect(editorView.querySelector('.autocomplete-plus')).toExist()
75-
expect(editorView.querySelector('.autocomplete-plus span.word')).toHaveText('linkeddir')
76-
expect(editorView.querySelector('.autocomplete-plus span.completion-label')).toHaveText('Dir')
88+
expect(editorView.querySelector('.autocomplete-plus .word')).toHaveText('linkeddir')
89+
expect(editorView.querySelector('.autocomplete-plus .right-label')).toHaveText('Dir')
7790

7891
it 'does not crash when typing an invalid folder', ->
7992
runs ->
@@ -131,5 +144,5 @@ describe 'Autocomplete Snippets', ->
131144

132145
runs ->
133146
expect(editorView.querySelector('.autocomplete-plus')).toExist()
134-
expect(editorView.querySelector('.autocomplete-plus span.word')).toHaveText('.gitkeep')
135-
expect(editorView.querySelector('.autocomplete-plus span.completion-label')).toHaveText('File')
147+
expect(editorView.querySelector('.autocomplete-plus .word')).toHaveText('.gitkeep')
148+
expect(editorView.querySelector('.autocomplete-plus .right-label')).toHaveText('File')

spec/issues/11-spec.coffee

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,17 @@ describe 'Issue 11', ->
1111
completionDelay += 100 # Rendering delay
1212
workspaceElement = atom.views.getView(atom.workspace)
1313
jasmine.attachToDOM(workspaceElement)
14-
autocompleteMain = atom.packages.loadPackage('autocomplete-plus').mainModule
14+
15+
autocompletePlusPkg = atom.packages.loadPackage 'autocomplete-plus'
16+
autocompletePlusPkg.requireMainModule()
17+
autocompleteMain = autocompletePlusPkg.mainModule
18+
1519
spyOn(autocompleteMain, 'consumeProvider').andCallThrough()
16-
pathsMain = atom.packages.loadPackage('autocomplete-paths').mainModule
20+
21+
pathPkg = atom.packages.loadPackage('autocomplete-paths')
22+
pathPkg.requireMainModule()
23+
pathsMain = pathPkg.mainModule
24+
1725
spyOn(pathsMain, 'provide').andCallThrough()
1826

1927
waitsForPromise ->

spec/large-file-spec.coffee

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,17 @@ describe 'Autocomplete Snippets', ->
1111
completionDelay += 100 # Rendering delay
1212
workspaceElement = atom.views.getView(atom.workspace)
1313
jasmine.attachToDOM(workspaceElement)
14-
autocompleteMain = atom.packages.loadPackage('autocomplete-plus').mainModule
14+
15+
autocompletePlusPkg = atom.packages.loadPackage 'autocomplete-plus'
16+
autocompletePlusPkg.requireMainModule()
17+
autocompleteMain = autocompletePlusPkg.mainModule
18+
1519
spyOn(autocompleteMain, 'consumeProvider').andCallThrough()
16-
pathsMain = atom.packages.loadPackage('autocomplete-paths').mainModule
20+
21+
pathPkg = atom.packages.loadPackage('autocomplete-paths')
22+
pathPkg.requireMainModule()
23+
pathsMain = pathPkg.mainModule
24+
1725
spyOn(pathsMain, 'provide').andCallThrough()
1826

1927
waitsForPromise ->

0 commit comments

Comments
 (0)