Merge pull request #495 from eregs/499-search-back

Check the correct version parameter in search.

docs/regulations.rst

@@ -18,6 +18,14 @@ Subpackages
 Submodules
 ----------
 
+regulations\.all\_urls module
+-----------------------------
+
+.. automodule:: regulations.all_urls
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 regulations\.apps module
 ------------------------
 

regulations/static/config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "regulations-site",
-  "version": "7.0.2",
+  "version": "8.1.0",
   "homepage": "https://eregs.github.io/",
   "contributors": [
     {

regulations/static/regulations/js/source/router.js

@@ -71,7 +71,7 @@ if (typeof window.history.pushState === 'undefined') {
     loadSearchResults: function loadSearchResults(docType, reg, params) {
       const config = {
         query: params.q,
-        regVersion: params.regVersion,
+        regVersion: params.version,
         docType,
       };
 

regulations/static/regulations/js/unittests/specs/router-spec.js

@@ -0,0 +1,44 @@
+import { expect } from 'chai';
+import jsdom from 'mocha-jsdom';
+import sinon from 'sinon';
+
+describe('RegRouter', () => {
+  jsdom();
+  let MainEvents;
+  let RegRouter;
+  let triggerStub;
+
+  before(() => {
+    MainEvents = require('../../source/events/main-events');
+    RegRouter = require('../../source/router');
+    triggerStub = sinon.stub(MainEvents, 'trigger');
+    window.history.pushState = true;
+  });
+
+  describe('::loadSearchResults', () => {
+    it('passes along the correct variables', () => {
+      RegRouter.loadSearchResults(
+        'aDocType', 'aReg', { q: 'terms here', version: 'aVersion' });
+      expect(triggerStub).to.have.been.calledWith(
+        'search-results:open',
+        null,
+        { query: 'terms here', regVersion: 'aVersion', docType: 'aDocType' },
+        'search-results');
+    });
+
+    it('passes along the page, if present', () => {
+      RegRouter.loadSearchResults(
+        'aDocType',
+        'aReg',
+        { q: 'terms here', version: 'aVersion', page: '4', ignored: 'aaa' });
+      expect(triggerStub).to.have.been.calledWith(
+        'search-results:open',
+        null,
+        { query: 'terms here',
+          regVersion: 'aVersion',
+          docType: 'aDocType',
+          page: '4' },
+        'search-results');
+    });
+  });
+});

setup.py

@@ -3,7 +3,7 @@
 
 setup(
     name="regulations",
-    version="8.0.0",
+    version="8.1.0",
     packages=find_packages(),
     include_package_data=True,
     install_requires=[