From 7f61ebe3a5a0cb99f2f4a67a342568b882fa687f Mon Sep 17 00:00:00 2001
From: Michael Schmatz <michaelschmatz@gmail.com>
Date: Sun, 12 Jan 2014 11:42:49 -0800
Subject: [PATCH 1/2] Added Travis CI build status indicator

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 676b2a65f..748a90d80 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,7 @@ CodeCombat
 ==========
 
 ![](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/readme_00.png)
+[![Build Status](https://travis-ci.org/codecombat/codecombat.png?branch=master)](https://travis-ci.org/codecombat/codecombat)
 
 CodeCombat is a multiplayer programming game for learning how to code. **See the [Archmage developer wiki](https://github.com/codecombat/codecombat/wiki) for a dev setup guide, extensive documentation, and much more.**
 

From 1f4bcd0073f53e5716c5bb284ea93ee2c835bcd6 Mon Sep 17 00:00:00 2001
From: Michael Schmatz <schmatz@umich.edu>
Date: Sun, 12 Jan 2014 11:57:13 -0800
Subject: [PATCH 2/2] Renamed all client-side tests to .spec.coffee

---
 test/app/lib/{forms.coffee => forms.spec.coffee}                  | 0
 test/app/lib/{goal_manager.coffee => goal_manager.spec.coffee}    | 0
 test/app/lib/{path.coffee => path.spec.coffee}                    | 0
 test/app/lib/{router.coffee => router.spec.coffee}                | 0
 .../app/lib/{script_manager.coffee => script_manager.spec.coffee} | 0
 test/app/lib/surface/{camera.coffee => camera.spec.coffee}        | 0
 .../lib/world/{goal_manager.coffee => goal_manager.spec.coffee}   | 0
 test/app/lib/world/{rectangle.coffee => rectangle.spec.coffee}    | 0
 test/app/lib/world/{thang.coffee => thang.spec.coffee}            | 0
 test/app/lib/world/{vector.coffee => vector.spec.coffee}          | 0
 test/app/lib/world/{world.coffee => world.spec.coffee}            | 0
 ...components_tab_view.coffee => components_tab_view.spec.coffee} | 0
 .../views/editor/{editor_view.coffee => editor_view.spec.coffee}  | 0
 .../{scripts_tab_view.coffee => scripts_tab_view.spec.coffee}     | 0
 .../{settings_tab_view.coffee => settings_tab_view.spec.coffee}   | 0
 .../{systems_tab_view.coffee => systems_tab_view.spec.coffee}     | 0
 .../{thangs_tab_view.coffee => thangs_tab_view.spec.coffee}       | 0
 17 files changed, 0 insertions(+), 0 deletions(-)
 rename test/app/lib/{forms.coffee => forms.spec.coffee} (100%)
 rename test/app/lib/{goal_manager.coffee => goal_manager.spec.coffee} (100%)
 rename test/app/lib/{path.coffee => path.spec.coffee} (100%)
 rename test/app/lib/{router.coffee => router.spec.coffee} (100%)
 rename test/app/lib/{script_manager.coffee => script_manager.spec.coffee} (100%)
 rename test/app/lib/surface/{camera.coffee => camera.spec.coffee} (100%)
 rename test/app/lib/world/{goal_manager.coffee => goal_manager.spec.coffee} (100%)
 rename test/app/lib/world/{rectangle.coffee => rectangle.spec.coffee} (100%)
 rename test/app/lib/world/{thang.coffee => thang.spec.coffee} (100%)
 rename test/app/lib/world/{vector.coffee => vector.spec.coffee} (100%)
 rename test/app/lib/world/{world.coffee => world.spec.coffee} (100%)
 rename test/app/views/editor/{components_tab_view.coffee => components_tab_view.spec.coffee} (100%)
 rename test/app/views/editor/{editor_view.coffee => editor_view.spec.coffee} (100%)
 rename test/app/views/editor/{scripts_tab_view.coffee => scripts_tab_view.spec.coffee} (100%)
 rename test/app/views/editor/{settings_tab_view.coffee => settings_tab_view.spec.coffee} (100%)
 rename test/app/views/editor/{systems_tab_view.coffee => systems_tab_view.spec.coffee} (100%)
 rename test/app/views/editor/{thangs_tab_view.coffee => thangs_tab_view.spec.coffee} (100%)

diff --git a/test/app/lib/forms.coffee b/test/app/lib/forms.spec.coffee
similarity index 100%
rename from test/app/lib/forms.coffee
rename to test/app/lib/forms.spec.coffee
diff --git a/test/app/lib/goal_manager.coffee b/test/app/lib/goal_manager.spec.coffee
similarity index 100%
rename from test/app/lib/goal_manager.coffee
rename to test/app/lib/goal_manager.spec.coffee
diff --git a/test/app/lib/path.coffee b/test/app/lib/path.spec.coffee
similarity index 100%
rename from test/app/lib/path.coffee
rename to test/app/lib/path.spec.coffee
diff --git a/test/app/lib/router.coffee b/test/app/lib/router.spec.coffee
similarity index 100%
rename from test/app/lib/router.coffee
rename to test/app/lib/router.spec.coffee
diff --git a/test/app/lib/script_manager.coffee b/test/app/lib/script_manager.spec.coffee
similarity index 100%
rename from test/app/lib/script_manager.coffee
rename to test/app/lib/script_manager.spec.coffee
diff --git a/test/app/lib/surface/camera.coffee b/test/app/lib/surface/camera.spec.coffee
similarity index 100%
rename from test/app/lib/surface/camera.coffee
rename to test/app/lib/surface/camera.spec.coffee
diff --git a/test/app/lib/world/goal_manager.coffee b/test/app/lib/world/goal_manager.spec.coffee
similarity index 100%
rename from test/app/lib/world/goal_manager.coffee
rename to test/app/lib/world/goal_manager.spec.coffee
diff --git a/test/app/lib/world/rectangle.coffee b/test/app/lib/world/rectangle.spec.coffee
similarity index 100%
rename from test/app/lib/world/rectangle.coffee
rename to test/app/lib/world/rectangle.spec.coffee
diff --git a/test/app/lib/world/thang.coffee b/test/app/lib/world/thang.spec.coffee
similarity index 100%
rename from test/app/lib/world/thang.coffee
rename to test/app/lib/world/thang.spec.coffee
diff --git a/test/app/lib/world/vector.coffee b/test/app/lib/world/vector.spec.coffee
similarity index 100%
rename from test/app/lib/world/vector.coffee
rename to test/app/lib/world/vector.spec.coffee
diff --git a/test/app/lib/world/world.coffee b/test/app/lib/world/world.spec.coffee
similarity index 100%
rename from test/app/lib/world/world.coffee
rename to test/app/lib/world/world.spec.coffee
diff --git a/test/app/views/editor/components_tab_view.coffee b/test/app/views/editor/components_tab_view.spec.coffee
similarity index 100%
rename from test/app/views/editor/components_tab_view.coffee
rename to test/app/views/editor/components_tab_view.spec.coffee
diff --git a/test/app/views/editor/editor_view.coffee b/test/app/views/editor/editor_view.spec.coffee
similarity index 100%
rename from test/app/views/editor/editor_view.coffee
rename to test/app/views/editor/editor_view.spec.coffee
diff --git a/test/app/views/editor/scripts_tab_view.coffee b/test/app/views/editor/scripts_tab_view.spec.coffee
similarity index 100%
rename from test/app/views/editor/scripts_tab_view.coffee
rename to test/app/views/editor/scripts_tab_view.spec.coffee
diff --git a/test/app/views/editor/settings_tab_view.coffee b/test/app/views/editor/settings_tab_view.spec.coffee
similarity index 100%
rename from test/app/views/editor/settings_tab_view.coffee
rename to test/app/views/editor/settings_tab_view.spec.coffee
diff --git a/test/app/views/editor/systems_tab_view.coffee b/test/app/views/editor/systems_tab_view.spec.coffee
similarity index 100%
rename from test/app/views/editor/systems_tab_view.coffee
rename to test/app/views/editor/systems_tab_view.spec.coffee
diff --git a/test/app/views/editor/thangs_tab_view.coffee b/test/app/views/editor/thangs_tab_view.spec.coffee
similarity index 100%
rename from test/app/views/editor/thangs_tab_view.coffee
rename to test/app/views/editor/thangs_tab_view.spec.coffee