Auto merge of #1949 - Mordorreal:fix/display-regular-and-build-dependencies, r=carols10cents

Filter crate dependencies by kind properly

Add strict filtering by 'kind' field for crates.
Add separate section for Build dependencies.
Refactor crate deps filter functions.
Add tests for filters.

Fixes: #1641

Author: bors

app/controllers/crate/version.js

@@ -70,9 +70,19 @@ export default Controller.extend({
     }
 
     return PromiseArray.create({
-      promise: deps.then(deps => {
-        return deps.filter(dep => dep.get('kind') !== 'dev').uniqBy('crate_id');
-      }),
+      promise: deps.then(deps => deps.filterBy('kind', 'normal').uniqBy('crate_id')),
+    });
+  }),
+
+  currentBuildDependencies: computed('currentVersion.dependencies', function() {
+    let deps = this.get('currentVersion.dependencies');
+
+    if (deps === null) {
+      return [];
+    }
+
+    return PromiseArray.create({
+      promise: deps.then(deps => deps.filterBy('kind', 'build').uniqBy('crate_id')),
     });
   }),
 
@@ -82,9 +92,7 @@ export default Controller.extend({
       return [];
     }
     return PromiseArray.create({
-      promise: deps.then(deps => {
-        return deps.filterBy('kind', 'dev');
-      }),
+      promise: deps.then(deps => deps.filterBy('kind', 'dev').uniqBy('crate_id')),
     });
   }),
 

app/templates/crate/version.hbs

@@ -217,6 +217,17 @@
           </ul>
         </div>
 
+        {{#if currentBuildDependencies}}
+          <div class='section' id='crate-build-dependencies'>
+            <h3>Build-Dependencies</h3>
+            <ul>
+              {{#each currentBuildDependencies as |dep|}}
+                {{link-to-dep tagName="li" dep=dep}}
+              {{/each}}
+            </ul>
+          </div>
+        {{/if}}
+
         {{#if currentDevDependencies}}
           <div class='section' id='crate-dev-dependencies'>
             <h3>Dev-Dependencies</h3>

mirage/fixtures/dependencies.js

@@ -26,11 +26,33 @@ export default [
     crate_id: 'nanomsg',
     default_features: true,
     features: '',
-    id: 90880,
+    id: 146233,
     kind: 'normal',
     optional: false,
     req: '^0.5.0',
     target: null,
     version_id: 28674,
   },
+  {
+    crate_id: 'mock-build-deps',
+    default_features: true,
+    features: '',
+    id: 146234,
+    kind: 'build',
+    optional: false,
+    req: '^0.6.1',
+    target: null,
+    version_id: 40905,
+  },
+  {
+    crate_id: 'mock-dev-deps',
+    default_features: true,
+    features: '',
+    id: 146235,
+    kind: 'dev',
+    optional: true,
+    req: '^0.6.1',
+    target: null,
+    version_id: 40905,
+  },
 ];

tests/acceptance/crate-test.js

@@ -154,6 +154,30 @@ module('Acceptance | crate page', function(hooks) {
     assert.dom('[data-test-heading] [data-test-team-name]').hasText('thehydroimpulseteam');
   });
 
+  test('crates having normal dependencies', async function(assert) {
+    this.server.loadFixtures();
+
+    await visit('crates/nanomsg');
+
+    assert.dom('#crate-dependencies li').exists({ count: 2 });
+  });
+
+  test('crates having build dependencies', async function(assert) {
+    this.server.loadFixtures();
+
+    await visit('crates/nanomsg');
+
+    assert.dom('#crate-build-dependencies li').exists({ count: 1 });
+  });
+
+  test('crates having dev dependencies', async function(assert) {
+    this.server.loadFixtures();
+
+    await visit('crates/nanomsg');
+
+    assert.dom('#crate-dev-dependencies li').exists({ count: 1 });
+  });
+
   test('crates having user-owners', async function(assert) {
     this.server.loadFixtures();