kotovalexarian-likes-github
/
jashkenas--coffeescript
mirror of https://github.com/jashkenas/coffeescript.git
1
0
Fork 0
Code Releases Activity

Resolve conflicts with `2` branch

This commit is contained in:
Geoffrey Booth 2016-10-26 09:05:35 -07:00
parent 26ad6d4670
commit 0d132318ce
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/error_messages.coffee
View File

@ -1155,7 +1155,7 @@ test "imported members cannot be reassigned", ->
^^^
'''
test "CS only keywords can't be used as unaliased names in import lists", ->
test "CoffeeScript keywords cannot be used as unaliased names in import lists", ->
assertErrorFormat """
import { unless, baz as bar } from 'lib'
bar.barMethod()
@ -1165,7 +1165,7 @@ test "CS only keywords can't be used as unaliased names in import lists", ->
^^^^^^
'''
test "CS only keywords can't be used as local names in import list aliases", ->
test "CoffeeScript keywords cannot be used as local names in import list aliases", ->
assertErrorFormat """
import { bar as unless, baz as bar } from 'lib'
bar.barMethod()

6
test/modules.coffee
View File

@ -510,7 +510,7 @@ test "export as aliases members imported from another module", ->
} from 'lib';"""
eq toJS(input), output
test "export list can contain CS only keywords", ->
test "export list can contain CoffeeScript keywords", ->
input = "export { unless } from 'lib'"
output = """
export {
@ -518,7 +518,7 @@ test "export list can contain CS only keywords", ->
} from 'lib';"""
eq toJS(input), output
test "export list can contain CS only keywords when aliasing", ->
test "export list can contain CoffeeScript keywords when aliasing", ->
input = "export { when as bar, baz as unless } from 'lib'"
output = """
export {
@ -625,7 +625,7 @@ test "`as` can be used as an alias name", ->
} from 'lib';"""
eq toJS(input), output
test "CS only keywords can be used as imported names in import lists", ->
test "CoffeeScript keywords can be used as imported names in import lists", ->
input = """
import { unless as bar } from 'lib'
bar.barMethod()"""