Merge pull request #796 from rust-lang/crates-route-mirage

Tweaks mirage response for /crates

Author: locks

mirage/config.js

@@ -17,27 +17,19 @@ export default function() {
     this.get('/summary', () => summaryFixture);
 
     this.get('/api/v1/crates', (db, request) => {
-        if (request.queryParams.q) {
-            const { start, end } = pageParams(request);
-            return {
-                crates: searchFixture.crates.slice(start, end),
-                meta: searchFixture.meta,
-            };
-        } else if (request.queryParams.team_id) {
-            const { start, end } = pageParams(request);
-            return {
-                team: teamFixture.team,
-                crates: searchFixture.crates.slice(start, end),
-                meta: searchFixture.meta,
-            };
+        const { start, end } = pageParams(request);
+        const payload = {
+            crates: searchFixture.crates.slice(start, end),
+            meta: searchFixture.meta,
+        };
+
+        if (request.queryParams.team_id) {
+            payload.team = teamFixture.team;
         } else if (request.queryParams.user_id) {
-            const { start, end } = pageParams(request);
-            return {
-                user: userFixture.user,
-                crates: searchFixture.crates.slice(start, end),
-                meta: searchFixture.meta,
-            };
+            payload.user = userFixture.user;
         }
+
+        return payload;
     });
 
     this.get('/api/v1/categories', () => categoriesFixture);

tests/acceptance/crates-test.js

@@ -0,0 +1,37 @@
+import { test } from 'qunit';
+import moduleForAcceptance from 'cargo/tests/helpers/module-for-acceptance';
+import hasText from 'cargo/tests/helpers/has-text';
+
+moduleForAcceptance('Acceptance | crates page');
+
+test('visiting the crates page from the front page', async function(assert) {
+    await visit('/');
+    await click('a[href="/crates"]');
+
+    assert.equal(currentURL(), '/crates');
+    assert.equal(document.title, 'Crates - Cargo: packages for Rust');
+});
+
+test('visiting the crates page directly', async function(assert) {
+    await visit('/crates');
+    await click('a[href="/crates"]');
+
+    assert.equal(currentURL(), '/crates');
+    assert.equal(document.title, 'Crates - Cargo: packages for Rust');
+});
+
+test('listing crates', async function(assert) {
+    await visit('/crates');
+
+    hasText(assert, '.amt.small .cur', '1-10');
+    hasText(assert, '.amt.small .total', '18');
+});
+
+test('navigating to next page of crates', async function(assert) {
+    await visit('/crates');
+    await click('.pagination .next');
+
+    assert.equal(currentURL(), '/crates?page=2');
+    hasText(assert, '.amt.small .cur', '11-18');
+    hasText(assert, '.amt.small .total', '18');
+});

yarn.lock

@@ -1,7 +1,5 @@
 # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
 # yarn lockfile v1
-# yarn v0.25.1
-# node v6.9.2
 
 
 abbrev@1:
@@ -5141,11 +5139,11 @@ route-recognizer@^0.2.3:
   version "0.2.9"
   resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.2.9.tgz#fbe06d7b7a52185d85c945a4782a18361f886d15"
 
-rsvp@^3.0.14, rsvp@^3.0.16, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21, rsvp@^3.1.0, rsvp@^3.2.1, rsvp@^3.4.0:
+rsvp@^3.0.14, rsvp@^3.0.16, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21, rsvp@^3.1.0, rsvp@^3.4.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.5.0.tgz#a62c573a4ae4e1dfd0697ebc6242e79c681eaa34"
 
-rsvp@^3.0.6, rsvp@^3.3.3:
+rsvp@^3.0.6, rsvp@^3.2.1, rsvp@^3.3.3:
   version "3.3.3"
   resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.3.3.tgz#34633caaf8bc66ceff4be3c2e1dffd032538a813"