changed recently updated to recent updates to match recent downloads

moore3071 · moore3071 · commit c0bcbf791e86 · 2018-02-21T20:07:59.000-05:00
diff --git a/app/controllers/category/index.js b/app/controllers/category/index.js
@@ -19,8 +19,8 @@ export default Controller.extend(PaginationMixin, {
             return 'All-Time Downloads';
         } else if (this.get('sort') === 'alpha') {
             return 'Alphabetical';
-        } else if (this.get('sort') === 'recently-updated') {
-            return 'Recently Updated';
+        } else if (this.get('sort') === 'recent-updates') {
+            return 'Recent Updates';
         } else {
             return 'Recent Downloads';
         }
diff --git a/app/controllers/crates.js b/app/controllers/crates.js
@@ -19,8 +19,8 @@ export default Controller.extend(PaginationMixin, {
             return 'All-Time Downloads';
         } else if (this.get('sort') === 'recent-downloads') {
             return 'Recent Downloads';
-        } else if (this.get('sort') === 'recently-updated') {
-            return 'Recently Updated';
+        } else if (this.get('sort') === 'recent-updates') {
+            return 'Recent Updates';
         } else {
             return 'Alphabetical';
         }
diff --git a/app/controllers/keyword/index.js b/app/controllers/keyword/index.js
@@ -17,8 +17,8 @@ export default Controller.extend(PaginationMixin, {
             return 'All-Time Downloads';
         } else if (this.get('sort') === 'alpha') {
             return 'Alphabetical';
-        } else if (this.get('sort') === 'recently-updated') {
-            return 'Recently Updated';
+        } else if (this.get('sort') === 'recent-updates') {
+            return 'Recent Updates';
         } else {
             return 'Recent Downloads';
         }
diff --git a/app/controllers/me/crates.js b/app/controllers/me/crates.js
@@ -19,8 +19,8 @@ export default Controller.extend(PaginationMixin, {
             return 'All-Time Downloads';
         } else if (this.get('sort') === 'recent-downloads') {
             return 'Recent Downloads';
-        } else if (this.get('sort') === 'recently-updated') {
-            return 'Recently Updated';
+        } else if (this.get('sort') === 'recent-updates') {
+            return 'Recent Updates';
         } else {
             return 'Alphabetical';
         }
diff --git a/app/controllers/search.js b/app/controllers/search.js
@@ -32,8 +32,8 @@ export default Controller.extend(PaginationMixin, {
             return 'All-Time Downloads';
         } else if (this.get('sort') === 'recent-downloads') {
             return 'Recent Downloads';
-        } else if (this.get('sort') === 'recently-updated') {
-            return 'Recently Updated';
+        } else if (this.get('sort') === 'recent-updates') {
+            return 'Recent Updates';
         } else {
             return 'Relevance';
         }
diff --git a/app/controllers/team.js b/app/controllers/team.js
@@ -17,8 +17,8 @@ export default Controller.extend(PaginationMixin, {
             return 'All-Time Downloads';
         } else if (this.get('sort') === 'recent-downloads') {
             return 'Recent Downloads';
-        } else if (this.get('sort') === 'recently-updated') {
-            return 'Recently Updated';
+        } else if (this.get('sort') === 'recent-updates') {
+            return 'Recent Updates';
         } else {
             return 'Alphabetical';
         }
diff --git a/app/controllers/user.js b/app/controllers/user.js
@@ -18,8 +18,8 @@ export default Controller.extend(PaginationMixin, {
             return 'All-Time Downloads';
         } else if (this.get('sort') === 'recent-downloads') {
             return 'Recent Downloads';
-        } else if (this.get('sort') === 'recently-updated') {
-            return 'Recently Updated';
+        } else if (this.get('sort') === 'recent-updates') {
+            return 'Recent Updates';
         } else {
             return 'Alphabetical';
         }
diff --git a/app/templates/category/index.hbs b/app/templates/category/index.hbs
@@ -70,8 +70,8 @@
                     {{/link-to}}
                 </li>
                 <li>
-                    {{#link-to (query-params sort="recently-updated")}}
-                        Recently Updated
+                    {{#link-to (query-params sort="recent-updates")}}
+                        Recent Updates
                     {{/link-to}}
                 </li>
             {{/rl-dropdown}}
diff --git a/app/templates/crates.hbs b/app/templates/crates.hbs
@@ -61,8 +61,8 @@
                     {{/link-to}}
                 </li>
                 <li>
-                    {{#link-to (query-params page=1 sort="recently-updated")}}
-                        Recently Updated
+                    {{#link-to (query-params page=1 sort="recent-updates")}}
+                        Recent Updates
                     {{/link-to}}
                 </li>
             {{/rl-dropdown}}
diff --git a/app/templates/keyword/index.hbs b/app/templates/keyword/index.hbs
@@ -41,8 +41,8 @@
                     {{/link-to}}
                 </li>
                 <li>
-                    {{#link-to (query-params sort="recently-updated")}}
-                        Recently Updated
+                    {{#link-to (query-params sort="recent-updates")}}
+                        Recent Updates
                     {{/link-to}}
                 </li>
             {{/rl-dropdown}}
diff --git a/app/templates/me/crates.hbs b/app/templates/me/crates.hbs
@@ -42,8 +42,8 @@
                     {{/link-to}}
                 </li>
                 <li>
-                    {{#link-to (query-params sort="recently-updated")}}
-                        Recently Updated
+                    {{#link-to (query-params sort="recent-updates")}}
+                        Recent Updates
                     {{/link-to}}
                 </li>
             {{/rl-dropdown}}
diff --git a/app/templates/search.hbs b/app/templates/search.hbs
@@ -53,8 +53,8 @@
                         {{/link-to}}
                     </li>
                     <li>
-                        {{#link-to (query-params page=1 sort="recently-updated")}}
-                            Recently Updated
+                        {{#link-to (query-params page=1 sort="recent-updates")}}
+                            Recent Updates
                         {{/link-to}}
                     </li>
                 {{/rl-dropdown}}
diff --git a/app/templates/team.hbs b/app/templates/team.hbs
@@ -56,8 +56,8 @@
                             {{/link-to}}
                         </li>
                         <li>
-                            {{#link-to (query-params sort="recently-updated")}}
-                                Recently Updated
+                            {{#link-to (query-params sort="recent-updates")}}
+                                Recent Updates
                             {{/link-to}}
                         </li>
                     {{/rl-dropdown}}
diff --git a/app/templates/user.hbs b/app/templates/user.hbs
@@ -47,8 +47,8 @@
                             {{/link-to}}
                         </li>
                         <li>
-                            {{#link-to (query-params sort="recently-updated")}}
-                                Recently Updated
+                            {{#link-to (query-params sort="recent-updates")}}
+                                Recent Updates
                             {{/link-to}}
                         </li>
                     {{/rl-dropdown}}
diff --git a/src/krate/search.rs b/src/krate/search.rs
@@ -68,7 +68,7 @@ pub fn search(req: &mut Request) -> CargoResult<Response> {
         query = query.order(crates::downloads.desc())
     } else if sort == "recent-downloads" {
         query = query.order(recent_downloads.clone().desc().nulls_last())
-    } else if sort == "recently-updated" {
+    } else if sort == "recent-updates" {
         query = query.order(crates::updated_at.desc())
     } else {
         query = query.order(crates::name.asc())
@@ -92,7 +92,7 @@ pub fn search(req: &mut Request) -> CargoResult<Response> {
             query = query.order((perfect_match, crates::downloads.desc()));
         } else if sort == "recent-downloads" {
             query = query.order((perfect_match, recent_downloads.clone().desc().nulls_last()));
-        } else if sort == "recently-updated" {
+        } else if sort == "recent-updates" {
             query = query.order(crates::updated_at.desc());
         } else {
             let rank = ts_rank_cd(crates::textsearchable_index_col, q);
diff --git a/src/tests/all.rs b/src/tests/all.rs
@@ -19,8 +19,8 @@ extern crate serde_derive;
 #[macro_use]
 extern crate serde_json;
 extern crate tar;
-extern crate url;
 extern crate time;
+extern crate url;
 
 use std::borrow::Cow;
 use std::collections::HashMap;
diff --git a/src/tests/krate.rs b/src/tests/krate.rs
@@ -357,8 +357,8 @@ fn index_sorting() {
     assert_eq!(json.crates[2].name, "bar_sort");
     assert_eq!(json.crates[3].name, "other_sort");
 
-    //Sort by recently-updated
-    let mut response = ok_resp!(middle.call(req.with_query("sort=recently-updated"),));
+    //Sort by recent-updates
+    let mut response = ok_resp!(middle.call(req.with_query("sort=recent-updates"),));
     let json: CrateList = ::json(&mut response);
     assert_eq!(json.meta.total, 4);
     assert_eq!(json.crates[0].name, "other_sort");
@@ -473,8 +473,8 @@ fn exact_match_on_queries_with_sort() {
     assert_eq!(json.crates[1].name, "foo_sort");
     assert_eq!(json.crates[2].name, "baz_sort");
 
-    //Sort by recently-updated
-    let mut response = ok_resp!(middle.call(req.with_query("q=bar_sort&sort=recently-updated"),));
+    //Sort by recent-updates
+    let mut response = ok_resp!(middle.call(req.with_query("q=bar_sort&sort=recent-updates"),));
     let json: CrateList = ::json(&mut response);
     assert_eq!(json.meta.total, 3);
     assert_eq!(json.crates[0].name, "baz_sort");
diff --git a/tests/acceptance/search-test.js b/tests/acceptance/search-test.js
@@ -29,7 +29,7 @@ test('searching for "rust"', async function(assert) {
     assert.dom('[data-test-heading]')
         .hasText('Search Results for \'rust\'');
     assert.dom('[data-test-search-nav]').hasText('Displaying 1-8 of 8 total results');
-    assert.dom('[data-test-search-sort]').hasText('Sort by Relevance Relevance All-Time Downloads Recent Downloads');
+    assert.dom('[data-test-search-sort]').hasText('Sort by Relevance Relevance All-Time Downloads Recent Downloads Recent Updates');
     assert.dom('[data-test-crate-row="0"] [data-test-crate-link]').hasText('kinetic-rust');
     assert.dom('[data-test-crate-row="0"] [data-test-version-badge]').hasAttribute('alt', '0.0.16');
 
