Merge pull request #30 from BrightspaceUI/Standardize_d2l_offscreen

Standardize d2l offscreen
BrightspaceUI · Nov 2, 2018 · 73a0dcb · 73a0dcb
2 parents 2080c84 + ca264da
commit 73a0dcb
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 24 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,18 @@
-language: node_js
+language: node_js
 node_js: node
-script:
-- npm run test
+addons:
+  chrome: stable
+script:
+- npm run test:lint
+- |
+  if [ $TRAVIS_PULL_REQUEST != false ] && [ $TRAVIS_SECURE_ENV_VARS == true ]; then
+    echo "Pull request with secure environment variables, running Sauce tests...";
+    npm run test:polymer:sauce || travis_terminate 1;
+  else
+    echo "Not a pull request and/or no secure environment variables, running headless tests...";
+    npm run test:polymer:local || travis_terminate 1;
+  fi
+env:
+  global:
+  - SAUCE_USERNAME: Desire2Learn
+  - secure: RtWC2uMUHvox7Y/qdWd7wrxEYedg1MdnZp9aoI2jL8KP4gi/efeFhzBIjIShnv6hnkJdf7Vy+5PTwgp4q6i4HZzmIAjyEGX+J5xd8emd3yrYg2puBrKI4bE+qzjnrWsc/9tbeqbRviFZzJzLzGCz9t1H3m/USKnzU71z7M3lFlA=
diff --git a/d2l-offscreen.html b/d2l-offscreen.html
@@ -9,7 +9,7 @@
 -->
 
 <dom-module id="d2l-offscreen">
-	<template>
+	<template strip-whitespace>
 		<style include="d2l-offscreen-shared-styles">
 			:host {
 				display: inline-block;

diff --git a/package.json b/package.json
@@ -6,7 +6,10 @@
     "postinstall": "polymer install --variants",
     "test:lint:html": "eslint *.html",
     "test:lint:wc": "polymer lint",
-    "test": "npm run test:lint:html && npm run test:lint:wc"
+    "test:lint": "npm run test:lint:html && npm run test:lint:wc",
+    "test:polymer:local": "polymer test --skip-plugin sauce",
+    "test:polymer:sauce": "polymer test --skip-plugin local",
+    "test": "npm run test:lint && npm run test:polymer:local"
   },
   "repository": {
     "type": "git",
@@ -29,9 +32,11 @@
   },
   "homepage": "https://github.com/BrightspaceUI/offscreen",
   "devDependencies": {
+    "chromedriver": "^2.40.0",
     "eslint": "^4.15.0",
     "eslint-config-brightspace": "^0.4.0",
     "eslint-plugin-html": "^4.0.1",
-    "polymer-cli": "^1.5.7"
+    "polymer-cli": "^1.5.7",
+    "sauce-connect-launcher": "^1.2.4"
   }
 }
diff --git a/test/index.html b/test/index.html
@@ -3,7 +3,7 @@
 	<head>
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
-		<title>d2l-button-group tests</title>
+		<title>d2l-offscreen tests</title>
 		<script src="../../webcomponentsjs/webcomponents-lite.js"></script>
 		<script src="../../web-component-tester/browser.js"></script>
 	</head>

diff --git a/wct.conf.json b/wct.conf.json
@@ -1,33 +1,26 @@
 {
-	"plugins": {
-		"local": {
-			"browsers": ["chrome"]
-		},
+  "plugins": {
+    "local": {
+      "browsers": ["chrome"],
+      "browserOptions": {
+        "chrome": ["headless", "disable-gpu", "no-sandbox"]
+      }
+    },
 		"sauce": {
 			"browsers": [
 				{
 					"browserName": "chrome",
-					"platform": "OS X 10.12",
-					"version": ""
-				},
-				{
-					"browserName": "chrome",
-					"platform": "Windows 10",
+					"platform": "OS X 10.13",
 					"version": ""
 				},
 				{
 					"browserName": "firefox",
-					"platform": "OS X 10.12",
-					"version": ""
-				},
-				{
-					"browserName": "firefox",
-					"platform": "Windows 10",
+					"platform": "OS X 10.13",
 					"version": ""
 				},
 				{
 					"browserName": "safari",
-					"platform": "OS X 10.12",
+					"platform": "OS X 10.13",
 					"version": ""
 				},
 				{