diff options
| -rw-r--r-- | utils/textgeneration.go | 3 | ||||
| -rw-r--r-- | web/react/package.json | 28 | ||||
| -rw-r--r-- | web/web_test.go | 9 |
3 files changed, 21 insertions, 19 deletions
diff --git a/utils/textgeneration.go b/utils/textgeneration.go index 043d7bb8a..6d353cc24 100644 --- a/utils/textgeneration.go +++ b/utils/textgeneration.go @@ -141,17 +141,14 @@ var FUZZY_STRINGS_NAMES = []string{ // Strings that should pass as acceptable emails var FUZZY_STRINGS_EMAILS = []string{ "sue@thatmightbe", - "sue@thatmightbe.", "sue@thatmightbe.c", "sue@thatmightbe.co", "su+san@thatmightbe.com", - "a@b.中国", "1@2.am", "a@b.co.uk", "a@b.cancerresearch", "su+s+an@thatmightbe.com", "per.iod@thatmightbe.com", - "per..iods@thatmightbe.com", } // Lovely giberish for all to use diff --git a/web/react/package.json b/web/react/package.json index da55dc2b8..e55722152 100644 --- a/web/react/package.json +++ b/web/react/package.json @@ -3,22 +3,22 @@ "version": "0.0.1", "private": true, "dependencies": { - "autolinker": "^0.18.1", - "flux": "^2.1.1", - "keymirror": "^0.1.1", - "object-assign": "^3.0.0", - "react": "^0.13.3", - "react-zeroclipboard-mixin": "^0.1.0", - "twemoji": "^1.4.1" + "autolinker": "0.18.1", + "flux": "2.1.1", + "keymirror": "0.1.1", + "object-assign": "3.0.0", + "react": "0.13.3", + "react-zeroclipboard-mixin": "0.1.0", + "twemoji": "1.4.1" }, "devDependencies": { - "browserify": "^11.0.1", - "envify": "^3.4.0", - "babelify": "^6.1.3", - "uglify-js": "^2.4.24", - "watchify": "^3.3.1", - "eslint": "^1.3.1", - "eslint-plugin-react": "^3.3.1" + "browserify": "11.0.1", + "envify": "3.4.0", + "babelify": "6.1.3", + "uglify-js": "2.4.24", + "watchify": "3.3.1", + "eslint": "1.3.1", + "eslint-plugin-react": "3.3.1" }, "scripts": { "start": "watchify --extension=jsx -o ../static/js/bundle.js -v -d ./**/*.jsx", diff --git a/web/web_test.go b/web/web_test.go index ff37b74d5..ccd0bba56 100644 --- a/web/web_test.go +++ b/web/web_test.go @@ -36,9 +36,14 @@ func TearDown() { func TestStatic(t *testing.T) { Setup() - resp, _ := http.Get(URL + "/static/images/favicon.ico") + // add a short delay to make sure the server is ready to receive requests + time.Sleep(1 * time.Second) - if resp.StatusCode != http.StatusOK { + resp, err := http.Get(URL + "/static/images/favicon.ico") + + if err != nil { + t.Fatalf("got error while trying to get static files %v", err) + } else if resp.StatusCode != http.StatusOK { t.Fatalf("couldn't get static files %v", resp.StatusCode) } } |