From 7466489dfa9326fda14c2a57e7f2c60e41313da9 Mon Sep 17 00:00:00 2001 From: James deBoer Date: Mon, 19 May 2014 12:02:26 -0700 Subject: [PATCH] feat(travis): Web platform features for Chrome 34 --- .travis.yml | 4 ++-- karma.conf.js | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 357e537dc..885a33c00 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,11 +14,11 @@ env: - JOB=unit-dev CHANNEL=dev TESTS=vm - BROWSERS=Dartium + BROWSERS=DartiumWithWebPlatform - JOB=unit-stable CHANNEL=stable TESTS=vm - BROWSERS=Dartium + BROWSERS=DartiumWithWebPlatform global: - FIREFOX_VERSION="29.0" - CHROME_BIN=/usr/bin/google-chrome diff --git a/karma.conf.js b/karma.conf.js index 7ebb473d6..d1afab100 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -44,10 +44,14 @@ module.exports = function(config) { }, customLaunchers: { - ChromeNoSandbox: { base: 'Chrome', flags: ['--no-sandbox'] } + ChromeNoSandbox: { base: 'Chrome', flags: ['--no-sandbox'] }, + // Only needed for Chrome 34. These features are enabled by default in Chrome 35. + DartiumWithWebPlatform: { + base: 'Dartium', + flags: ['--enable-experimental-web-platform-features'] } }, - browsers: ['Dartium'], + browsers: ['DartiumWithWebPlatform'], preprocessors: { 'test/core/parser/generated_getter_setter.dart': ['parser-getter-setter']