Merge pull request #153 from basho-labs/tbh/fix-tests

Riak TS 1.5 Support and Fix Integration Tests

priv/ember_riak_explorer/dist/assets/ember-riak-explorer.js

@@ -29609,22 +29609,24 @@ define('ember-riak-explorer/serializers/table', ['exports', 'ember-riak-explorer
 
         // Assign partition key
         table.partition_key = [];
-        ddl.partition_key.forEach(function (pk) {
-          var isQuanta = pk.indexOf('quantum') > -1;
-
-          // Reformat quantum to have spaces after commas
-          if (isQuanta) {
-            pk = pk.split(',').join(', ');
-          }
+        Object.keys(ddl.partition_key).forEach(function (pk_field) {
+          var isQuanta = pk_field.indexOf('quantum') !== -1;
+          var name = isQuanta ? pk_field.split(',').join(', ') : pk_field;
 
           table.partition_key.push({
-            name: pk,
+            name: name,
             quantum: isQuanta
           });
         });
 
         // Assign local key
-        table.local_key = ddl.local_key;
+        table.local_key = [];
+        Object.keys(ddl.local_key).forEach(function (lk_field) {
+          table.local_key.push({
+            name: lk_field,
+            ordering: ddl.local_key[lk_field].ordering
+          });
+        });
 
         delete table.props.ddl;
       });
@@ -38790,7 +38792,7 @@ define("ember-riak-explorer/templates/components/table/table-overview", ["export
             },
             "end": {
               "line": 27,
-              "column": 96
+              "column": 101
             }
           },
           "moduleName": "ember-riak-explorer/templates/components/table/table-overview.hbs"
@@ -38813,7 +38815,7 @@ define("ember-riak-explorer/templates/components/table/table-overview", ["export
           morphs[0] = dom.createMorphAt(dom.childAt(fragment, [0]), 0, 0);
           return morphs;
         },
-        statements: [["content", "key", ["loc", [null, [27, 82], [27, 89]]]]],
+        statements: [["content", "key.name", ["loc", [null, [27, 82], [27, 94]]]]],
         locals: ["key"],
         templates: []
       };
@@ -39114,7 +39116,7 @@ define("ember-riak-explorer/templates/components/table/table-overview", ["export
         morphs[4] = dom.createMorphAt(dom.childAt(fragment, [8, 3, 1, 3]), 1, 1);
         return morphs;
       },
-      statements: [["content", "table.name", ["loc", [null, [3, 20], [3, 34]]]], ["block", "if", [["get", "table.isActive", ["loc", [null, [9, 10], [9, 24]]]]], [], 0, 1, ["loc", [null, [9, 4], [13, 11]]]], ["block", "each", [["get", "table.partitionKey", ["loc", [null, [20, 38], [20, 56]]]]], [], 2, null, ["loc", [null, [20, 30], [20, 114]]]], ["block", "each", [["get", "table.localKey", ["loc", [null, [27, 38], [27, 52]]]]], [], 3, null, ["loc", [null, [27, 30], [27, 105]]]], ["block", "each", [["get", "table.columns", ["loc", [null, [44, 14], [44, 27]]]]], [], 4, null, ["loc", [null, [44, 6], [51, 15]]]]],
+      statements: [["content", "table.name", ["loc", [null, [3, 20], [3, 34]]]], ["block", "if", [["get", "table.isActive", ["loc", [null, [9, 10], [9, 24]]]]], [], 0, 1, ["loc", [null, [9, 4], [13, 11]]]], ["block", "each", [["get", "table.partitionKey", ["loc", [null, [20, 38], [20, 56]]]]], [], 2, null, ["loc", [null, [20, 30], [20, 114]]]], ["block", "each", [["get", "table.localKey", ["loc", [null, [27, 38], [27, 52]]]]], [], 3, null, ["loc", [null, [27, 30], [27, 110]]]], ["block", "each", [["get", "table.columns", ["loc", [null, [44, 14], [44, 27]]]]], [], 4, null, ["loc", [null, [44, 6], [51, 15]]]]],
       locals: [],
       templates: [child0, child1, child2, child3, child4]
     };
@@ -43666,7 +43668,7 @@ catch(err) {
 /* jshint ignore:start */
 
 if (!runningTests) {
-  require("ember-riak-explorer/app")["default"].create({"name":"ember-riak-explorer","version":"0.2.0+e5fff7ee"});
+  require("ember-riak-explorer/app")["default"].create({"name":"ember-riak-explorer","version":"0.2.0+a0e7168e"});
 }
 
 /* jshint ignore:end */

priv/ember_riak_explorer/dist/index.html

@@ -7,7 +7,7 @@
   <meta name="description" content="">
   <meta name="viewport" content="width=device-width, initial-scale=1">
 
-<meta name="ember-riak-explorer/config/environment" content="%7B%22modulePrefix%22%3A%22ember-riak-explorer%22%2C%22podModulePrefix%22%3A%22ember-riak-explorer/pods%22%2C%22environment%22%3A%22development%22%2C%22baseURL%22%3Anull%2C%22locationType%22%3A%22hash%22%2C%22pageSize%22%3A500%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%7D%2C%22APP%22%3A%7B%22name%22%3A%22ember-riak-explorer%22%2C%22version%22%3A%220.2.0+e5fff7ee%22%7D%2C%22exportApplicationGlobal%22%3Atrue%7D" />
+<meta name="ember-riak-explorer/config/environment" content="%7B%22modulePrefix%22%3A%22ember-riak-explorer%22%2C%22podModulePrefix%22%3A%22ember-riak-explorer/pods%22%2C%22environment%22%3A%22development%22%2C%22baseURL%22%3Anull%2C%22locationType%22%3A%22hash%22%2C%22pageSize%22%3A500%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%7D%2C%22APP%22%3A%7B%22name%22%3A%22ember-riak-explorer%22%2C%22version%22%3A%220.2.0+a0e7168e%22%7D%2C%22exportApplicationGlobal%22%3Atrue%7D" />
   <link rel="stylesheet" href="http://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css">
   <link rel="stylesheet" href="assets/ember-riak-explorer.css">
   <link rel="stylesheet" href="assets/vendor.css">

priv/ember_riak_explorer/dist/tests/index.html

@@ -8,7 +8,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
     <base href="/" />
-<meta name="ember-riak-explorer/config/environment" content="%7B%22modulePrefix%22%3A%22ember-riak-explorer%22%2C%22podModulePrefix%22%3A%22ember-riak-explorer/pods%22%2C%22environment%22%3A%22test%22%2C%22baseURL%22%3A%22/%22%2C%22locationType%22%3A%22none%22%2C%22pageSize%22%3A500%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%7D%2C%22APP%22%3A%7B%22LOG_ACTIVE_GENERATION%22%3Afalse%2C%22LOG_VIEW_LOOKUPS%22%3Afalse%2C%22rootElement%22%3A%22%23ember-testing%22%2C%22name%22%3A%22ember-riak-explorer%22%2C%22version%22%3A%220.2.0+e5fff7ee%22%7D%2C%22exportApplicationGlobal%22%3Atrue%7D" />
+<meta name="ember-riak-explorer/config/environment" content="%7B%22modulePrefix%22%3A%22ember-riak-explorer%22%2C%22podModulePrefix%22%3A%22ember-riak-explorer/pods%22%2C%22environment%22%3A%22test%22%2C%22baseURL%22%3A%22/%22%2C%22locationType%22%3A%22none%22%2C%22pageSize%22%3A500%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%7D%2C%22APP%22%3A%7B%22LOG_ACTIVE_GENERATION%22%3Afalse%2C%22LOG_VIEW_LOOKUPS%22%3Afalse%2C%22rootElement%22%3A%22%23ember-testing%22%2C%22name%22%3A%22ember-riak-explorer%22%2C%22version%22%3A%220.2.0+a0e7168e%22%7D%2C%22exportApplicationGlobal%22%3Atrue%7D" />
 
 
     <link rel="stylesheet" href="assets/vendor.css">

src/re_node.erl

@@ -480,10 +480,10 @@ config(Node) ->
 http_listener(Node) ->
     NodeStr = atom_to_list(Node),
     [_,Addr] = string:tokens(NodeStr, "@"),
-    case command(Node, application, get_env, [riak_api, http]) of
+    case command(Node, riak_api_web, get_listeners, []) of
         {error, Reason} ->
             {error, Reason};
-        {ok,[{_,Port}]} ->
+        [{http,{_,Port}}|_] ->
             list_to_binary(Addr ++ ":" ++ integer_to_list(Port))
     end.