From dcc6109724fb7c35ccbdf3fb2f3fee26ae88eb94 Mon Sep 17 00:00:00 2001
From: chrisradek <radekc@amazon.com>
Date: Mon, 29 Aug 2016 20:37:28 -0700
Subject: [PATCH] Fixes tests

---
 package.json       | 2 +-
 tasks/browser.rake | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index d0575d0baf..6ef22e023e 100644
--- a/package.json
+++ b/package.json
@@ -92,7 +92,7 @@
     "waf"
   ],
   "scripts": {
-    "test": "npm -s run-script lint && npm -s run-script unit && npm -s run-script buildertest && npm -s run-script browsertest && ([ -f configuration ] && npm -s run-script integration || true)",
+    "test": "npm -s run-script lint && npm -s run-script unit && npm -s run-script browsertest && ([ -f configuration ] && npm -s run-script integration || true)",
     "unit": "istanbul `[ $COVERAGE ] && echo 'cover _mocha' || echo 'test mocha'` -- test test/json test/model test/protocol test/query test/services test/signers test/xml test/s3 test/cloudfront",
     "coverage": "istanbul cover ./node_modules/mocha/bin/_mocha -- test test/json test/model test/protocol test/query test/services test/signers test/xml",
     "browsertest": "rake browser:test",
diff --git a/tasks/browser.rake b/tasks/browser.rake
index 250dd3ddea..4811883240 100644
--- a/tasks/browser.rake
+++ b/tasks/browser.rake
@@ -25,7 +25,7 @@ def sdk_version
 end
 
 namespace :browser do
-  $BUILDER = "node dist-tools/browser-builder.js"
+  $BUILDER = "node dist-tools/service-loader.js"
   $BROWSERIFY = "browserify"
   $BROWSERIFY_DIST = "dist/aws-sdk.js"
   $BROWSERIFY_TEST = "test/browser/build/tests.js"
@@ -50,7 +50,8 @@ namespace :browser do
   end
 
   task :build_all => [:setup_dist_tools, :dist_path] do
-    sh({"MINIFY" => ""}, "#{$BUILDER} all > dist/aws-sdk-all.js")
+    sh({"MINIFY" => ""}, "AWS_SERVICES=all #{$BUILDER}")
+    sh "#{$BROWSERIFY} ./ > dist/aws-sdk-all.js"
   end
 
   desc 'Caches assets to the dist-tools build server'