Merge branch 'master' into ns-fix-softwrap

spec/select-list-view-spec.coffee

@@ -1,7 +1,7 @@
-SelectList = require '../src/select-list'
+SelectListView = require '../src/select-list-view'
 {$, $$} = require 'atom'
 
-describe "SelectList", ->
+describe "SelectListView", ->
   [selectList, array, list, miniEditor] = []
 
   beforeEach ->
@@ -10,7 +10,7 @@ describe "SelectList", ->
       ["D", "Delta"], ["E", "Echo"], ["F", "Foxtrot"]
     ]
 
-    selectList = new SelectList
+    selectList = new SelectListView
     selectList.maxItems = 4
     selectList.filterKey = 1
     selectList.itemForElement = (element) ->

spec/theme-manager-spec.coffee

@@ -160,7 +160,7 @@ describe "ThemeManager", ->
 
   describe "when the user stylesheet changes", ->
     it "reloads it", ->
-      userStylesheetPath = path.join(temp.mkdirSync("atom"), 'user.css')
+      userStylesheetPath = path.join(temp.mkdirSync("atom"), 'styles.css')
       fs.writeFileSync(userStylesheetPath, 'body {border-style: dotted !important;}')
 
       spyOn(themeManager, 'getUserStylesheetPath').andReturn userStylesheetPath