Merge pull request #5 from Oreoz/updating-dependencies

Updating Dependencies

.travis.yml

@@ -1,9 +1,14 @@
 language: node_js
-sudo: false
 
 node_js:
   - "4"
 
+sudo: false
+dist: trusty
+
+addons:
+  chrome: stable
+
 cache:
   yarn: true
 
@@ -23,8 +28,6 @@ matrix:
 before_install:
   - curl -o- -L https://yarnpkg.com/install.sh | bash
   - export PATH=$HOME/.yarn/bin:$PATH
-  - yarn global add phantomjs-prebuilt
-  - phantomjs --version
 
 install:
   - yarn install --no-lockfile --non-interactive

README.md

@@ -27,13 +27,13 @@ Here's how you would go about creating a simple timeline:
 
     {{#block.content as |content|}}
 
-      [[Whatever you want to display inside of the timeline block.]]
+      {{!Whatever you want to display inside of the timeline block.}}
 
       {{#content.date}}Jun 28{{/content.date}}
     {{/block.content}}
   {{/timeline.block}}
 
-  [[More blocks would go here]]
+  {{!More blocks would go here}}
 
 {{/vertical-timeline}}
 
@@ -42,29 +42,6 @@ Here's how you would go about creating a simple timeline:
 ## Contributions
 Any contribution is more than welcomed. If you plan on introducing a new feature, please open an issue and share your idea prior to implementing it, it could save you precious time!
 
-### Installation
-
-* `git clone` this repository
-* `npm install`
-* `bower install`
-
-### Running
-
-* `ember server`
-* Visit your app at http://localhost:4200.
-
-### Running Tests
-
-* `npm test` (Runs `ember try:testall` to test your addon against multiple Ember versions)
-* `ember test`
-* `ember test --server`
-
-### Building
-
-* `ember build`
-
-For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
-
 ## Troubleshooting
 If something is not working as expected, simply open an issue and we'll discuss how we'll go about fixing it!
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-vertical-timeline",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "description": "An ember wrapper for the Vertical Timeline initially created by CodyHouse",
   "keywords": [
     "ember-addon",
@@ -33,11 +33,11 @@
   "devDependencies": {
     "broccoli-asset-rev": "^2.4.5",
     "ember-ajax": "^3.0.0",
-    "ember-cli": "~2.14.2",
-    "ember-cli-autoprefixer": "^0.7.0",
-    "ember-cli-dependency-checker": "^1.3.0",
-    "ember-cli-eslint": "^3.0.0",
-    "ember-cli-htmlbars-inline-precompile": "^0.4.3",
+    "ember-cli": "~2.15.0",
+    "ember-cli-dependency-checker": "^2.0.0",
+    "ember-cli-htmlbars-inline-precompile": "^1.0.0",
+    "ember-cli-htmlbars": "^2.0.1",
+    "ember-cli-eslint": "^4.0.0",
     "ember-cli-inject-live-reload": "^1.4.1",
     "ember-cli-qunit": "^4.0.0",
     "ember-cli-sass": "^6.2.0",
@@ -48,11 +48,11 @@
     "ember-export-application-global": "^2.0.0",
     "ember-load-initializers": "^1.0.0",
     "ember-resolver": "^4.0.0",
-    "ember-source": "~2.14.1",
+    "ember-source": "~2.15.0",
     "loader.js": "^4.2.3"
   },
   "engines": {
-    "node": "^4.5 || 6.* || >= 7.*"
+    "node": "^4.5 || 6.* || >= 7.*"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"

testem.js

@@ -3,10 +3,17 @@ module.exports = {
   test_page: 'tests/index.html?hidepassed',
   disable_watching: true,
   launch_in_ci: [
-    'PhantomJS'
+    'Chrome'
   ],
   launch_in_dev: [
-    'PhantomJS',
     'Chrome'
-  ]
+  ],
+  browser_args: {
+    Chrome: [
+      '--disable-gpu',
+      '--headless',
+      '--remote-debugging-port=9222',
+      '--window-size=1440,900'
+    ]
+  }
 };

tests/dummy/app/index.html

@@ -9,8 +9,8 @@
 
     {{content-for "head"}}
 
-    <link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
-    <link rel="stylesheet" href="{{rootURL}}assets/dummy.css">
+    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css">
+    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/dummy.css">
 
     {{content-for "head-footer"}}
   </head>