Merge pull request #3 from flightjs/feature/karma-runner

Use Karma runner
flightjs · Jul 12, 2013 · 8c5d952 · 8c5d952
2 parents 4b532f8 + fec8067
commit 8c5d952
Show file tree

Hide file tree

Showing 39 changed files with 885 additions and 3,548 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+# Automatically normalize line endings for all text-based files
+* text=auto
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+node_modules
diff --git a/.travis.yml b/.travis.yml
@@ -5,4 +5,3 @@ node_js:
 before_script:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
-script: "phantomjs components/phantom-jasmine/run_jasmine_test.coffee test/run/jasmine_test.html"
diff --git a/app/component_data/compose_box.js b/app/component_data/compose_box.js
@@ -3,7 +3,7 @@
 define(
 
   [
-    'components/flight/lib/component',
+    'flight/lib/component',
     'components/mustache/mustache',
     'app/data',
     'app/templates'

diff --git a/app/component_data/mail_items.js b/app/component_data/mail_items.js
@@ -3,7 +3,7 @@
 define(
 
   [
-    'components/flight/lib/component',
+    'flight/lib/component',
     'components/mustache/mustache',
     'app/data',
     'app/templates'

diff --git a/app/component_data/move_to.js b/app/component_data/move_to.js
@@ -3,7 +3,7 @@
 define(
 
   [
-    'components/flight/lib/component',
+    'flight/lib/component',
     'components/mustache/mustache',
     'app/data',
     'app/templates'

diff --git a/app/component_ui/compose_box.js b/app/component_ui/compose_box.js
@@ -3,7 +3,7 @@
 define(
 
   [
-    'components/flight/lib/component'
+    'flight/lib/component'
   ],
 
   function(defineComponent) {

diff --git a/app/component_ui/folders.js b/app/component_ui/folders.js
@@ -3,7 +3,7 @@
 define(
 
   [
-    'components/flight/lib/component',
+    'flight/lib/component',
     './with_select'
   ],
 

diff --git a/app/component_ui/mail_controls.js b/app/component_ui/mail_controls.js
@@ -2,7 +2,7 @@
 
 define(
   [
-    'components/flight/lib/component'
+    'flight/lib/component'
   ],
 
   function(defineComponent) {

diff --git a/app/component_ui/mail_items.js b/app/component_ui/mail_items.js
@@ -3,7 +3,7 @@
 define(
 
   [
-    'components/flight/lib/component',
+    'flight/lib/component',
     './with_select'
   ],
 

diff --git a/app/component_ui/move_to_selector.js b/app/component_ui/move_to_selector.js
@@ -3,7 +3,7 @@
 define(
 
   [
-    'components/flight/lib/component',
+    'flight/lib/component',
     './with_select'
   ],
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# Automatically normalize line endings for all text-based files
		* text=auto
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ @@
     define(
       [
-        'components/flight/lib/component'
+        'flight/lib/component'
       ],
       function(defineComponent) {
@@ Expand Down @@