Skip to content

Commit

Permalink
Fix Travis
Browse files Browse the repository at this point in the history
Updated a bunch of things:

* Karma libraries
* Travis Ubuntu version
* Travis Firefox version

Also for good measure, removed erroneous network requests from client tests.
  • Loading branch information
phoenixeliot authored and sderickson committed Sep 26, 2017
1 parent ad60c3d commit d666e38
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 5 deletions.
5 changes: 4 additions & 1 deletion .travis.yml
Expand Up @@ -4,7 +4,10 @@ node_js:
- 5.1.1
env:
- CXX=g++-4.8
services:
- mongodb
addons:
firefox: "55.0"
apt:
sources:
- mongodb-upstart
Expand Down Expand Up @@ -42,4 +45,4 @@ notifications:
on_failure: always
on_start: never
on_pull_requests: false
dist: precise
dist: trusty
1 change: 1 addition & 0 deletions app/models/ThangType.coffee
Expand Up @@ -368,6 +368,7 @@ module.exports = class ThangType extends CocoModel
@wizardType

getPortraitURL: ->
return '' if application.testing
if iconURL = @get('rasterIcon')
return "/file/#{iconURL}"
if rasterURL = @get('raster')
Expand Down
1 change: 1 addition & 0 deletions app/models/User.coffee
Expand Up @@ -36,6 +36,7 @@ module.exports = class User extends CocoModel
broadName: -> User.broadName(@attributes)

getPhotoURL: (size=80) ->
return '' if application.testing
return "/db/user/#{@id}/avatar?s=#{size}"

getRequestVerificationEmailURL: ->
Expand Down
1 change: 0 additions & 1 deletion app/views/TestView.coffee
Expand Up @@ -72,7 +72,6 @@ module.exports = TestView = class TestView extends RootView
@specFiles = (f for f in @specFiles when _.string.startsWith f, prefix)

@runTests: (specFiles, demosOn=false, view) ->

jasmine.getEnv().addReporter({
suiteStack: []

Expand Down
1 change: 1 addition & 0 deletions app/views/play/level/modal/CourseVictoryModal.coffee
Expand Up @@ -154,5 +154,6 @@ module.exports = class CourseVictoryModal extends ModalView
Backbone.Mediator.publish 'router:navigate', route: ladderURL, viewClass: 'views/ladder/LadderView', viewArgs: viewArgs

submitLadder: ->
return if application.testing
if @level.get('type') is 'course-ladder' and @session.readyToRank() or not @session.inLeague(@courseInstanceID)
api.levelSessions.submitToRank({ session: @session.id, courseInstanceID: @courseInstanceID })
5 changes: 5 additions & 0 deletions karma.conf.js
Expand Up @@ -71,6 +71,11 @@ module.exports = function(config) {
dir : 'coverage/'
},

//browserConsoleLogOptions: {
// level: 'log',
// terminal: true
//},

plugins : [
'karma-jasmine',
'karma-chrome-launcher',
Expand Down
6 changes: 3 additions & 3 deletions package.json
Expand Up @@ -131,11 +131,11 @@
"jade-brunch": "1.7.5",
"jasmine": "2.4.1",
"javascript-brunch": "> 1.0 < 1.8",
"karma": "~0.13",
"karma-chrome-launcher": "~0.1.2",
"karma": "^1.7.1",
"karma-chrome-launcher": "^0.1.12",
"karma-coffee-preprocessor": "~0.1.2",
"karma-coverage": "~0.5.1",
"karma-firefox-launcher": "~0.1.3",
"karma-firefox-launcher": "^0.1.7",
"karma-html2js-preprocessor": "~0.1.0",
"karma-jasmine": "^1.0.2",
"karma-phantomjs-launcher": "~0.1.1",
Expand Down

0 comments on commit d666e38

Please sign in to comment.