Skip to content

Instantly share code, notes, and snippets.

View justinvdm's full-sized avatar

Justin van der Merwe justinvdm

View GitHub Profile
function canUseReact() {
return Object.create
&& Object.freeze
&& Date.now
&& Object.keys
&& Array.isArray
&& Array.prototype.every
&& Array.prototype.forEach
&& Array.prototype.indexOf
&& Array.prototype.map
diff --git a/package.json b/package.json
index 464b7e4..68c02c9 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
},
"dependencies": {
"jed": "~0.5",
- "q": "~0.9"
+ "q": "~0.9.7"
diff --git a/test/test_user.js b/test/test_user.js
index 0c23e64..abe390f 100644
--- a/test/test_user.js
+++ b/test/test_user.js
@@ -323,14 +323,14 @@ describe("User", function() {
it("should save the user", function() {
user.set_answer('why', 'no');
- user
+ return user
diff --git a/lib/index.js b/lib/index.js
index 98c655e..4c045ef 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -7,6 +7,9 @@ this.App = this.app.App;
this.dummy_api = require("./dummy_api");
this.DummyApi = this.dummy_api.DummyApi;
+this.tester = require("./tester");
+this.AppTester = this.tester.AppTester;
var data = [
{foo: 1},
{foo: 2}];
// if you have objects with the same `foo` value, their current ordering with
// respect to each other *will not* be preserved.
data.sort(function(a, b) {
return a.foo < b.foo
? 1
: 0;
diff --git a/diamondash/public/css/vendor.css b/diamondash/public/css/vendor.css
index bbda4ee..377dff3 100644
--- a/diamondash/public/css/vendor.css
+++ b/diamondash/public/css/vendor.css
@@ -1,14 +1,10 @@
/*!
- * Bootstrap v3.0.0
- *
- * Copyright 2013 Twitter, Inc
- * Licensed under the Apache License v2.0
diff --git a/bower.json b/bower.json
index 76ddde5..fb4fa1c 100644
--- a/bower.json
+++ b/bower.json
@@ -32,6 +32,9 @@
"css": "dist/css/*",
"fonts": "dist/fonts/*"
},
+ "jquery-simulate": {
+ "js": "jquery.simulate.js"
diff --git a/bower.json b/bower.json
index 76ddde5..fb4fa1c 100644
--- a/bower.json
+++ b/bower.json
@@ -32,6 +32,9 @@
"css": "dist/css/*",
"fonts": "dist/fonts/*"
},
+ "jquery-simulate": {
+ "js": "jquery.simulate.js"
// Ok, so the thing about U-Report is that it is state machine based,
// so the dummy api could get complicated fast. I think we have two choices
// for the dummy ureport api:
// 1. Make it stub-like, and just tell it what to respond each time
// 2. Actually implement the state machine logic
//
// Approach one will probably be less work, but more overhead for writing each
// test. Biggest problem is, there isn't an easy way to use the dummy api as
// a demo.
//
diff --git a/package.json b/package.json
index ac92d25..77257f6 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,6 @@
"name": "vumi-ureport",
"version": "0.0.0",
"description": "The vumi jsbox application for the U-Report project",
- "main": "index.js",
"scripts": {