update travis

karlgroves · Oct 1, 2016 · 2d97c11 · 2d97c11
1 parent 6a4cbbb
commit 2d97c11
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,38 @@
+
+# -*- mode: gitignore; -*-
+node_modules
 .DS_Store
-/node_modules/
-/bower_components/
+
+### PHP storm ###
 .idea
 .idea/*
 .idea/workspace.xml
 atlassian-ide-plugin.xml
 .settings
+
+### vim ###
+[._]*.s[a-w][a-z]
+[._]s[a-w][a-z]
+*.un~
+Session.vim
+.netrwhist
+*~
+
+### Emacs ###
+\#*\#
+/.emacs.desktop
+/.emacs.desktop.lock
+*.elc
+auto-save-list
+tramp
+.\#*
+
+
+.project
+*.diff
+*.patch
+node_modules
+bower_components
+temp
+.tmp
+dist
diff --git a/.travis.yml b/.travis.yml
@@ -2,3 +2,11 @@ language: node_js
 node_js:
   - '0.10'
   - '0.8'
+before_install:
+  - npm update -g npm
+  - npm install -g grunt-cli
+  - npm install -g bower
+  - bower install
+before_script:
+  - grunt
+  - grunt test
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -74,18 +74,30 @@ module.exports = function (grunt) {
                 tasks: ['jshint:test', 'qunit']
             }
         },
+
+
         connect: {
-            server: {
+            test: {
                 options: {
                     hostname: '*',
                     port: 9000
                 }
+            },
+            demo: {
+                options: {
+                    protocol: 'http',
+                    port: 9000,
+                    hostname: '*',
+                    base: 'demo',
+                    directory: 'demo',
+                    keepalive: true
+                }
             }
         }
     });
 
     // Default task.
-    grunt.registerTask('default', ['jshint', 'connect', 'qunit', 'clean', 'uglify']);
-    grunt.registerTask('server', ['connect', 'watch']);
-    grunt.registerTask('test', ['jshint', 'connect', 'qunit']);
+    grunt.registerTask('default', ['jshint', 'clean', 'uglify']);
+    grunt.registerTask('server', ['connect:test', 'watch']);
+    grunt.registerTask('test', ['connect:test', 'qunit']);
 };
diff --git a/demo/index.html b/demo/index.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8"/>
     <title>jQueryUI accessible .dialog() demo</title>
-    <script src="../bower_components/jquery/dist/jquery.min.js"></script>
+    <script src="bower_components/jquery/dist/jquery.min.js"></script>
     <script src="../bower_components/jqueryui/jquery-ui.min.js"></script>
     <script src="../src/a11yDialog.js"></script>
     <link type="text/css" rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css" />

diff --git a/dist/a11yDialog.min.js b/dist/a11yDialog.min.js