Merge branch 'master' of github.com:TheScienceMuseum/collectionsonline

.gitignore

@@ -6,6 +6,9 @@ logs
 *.log
 npm-debug.log*
 
+# OSX
+.DS_Store
+
 # Runtime data
 pids
 *.pid

lib/facets/create-facets.js

@@ -18,7 +18,7 @@ module.exports = function createAllFacets (results) {
     organisation: a.organisation.organisations_filters.buckets.map(v => { return {value: v.key, count: v.doc_count}; }),
     material: a.material.material_filters.buckets.map(v => { return {value: v.key, count: v.doc_count}; }),
     museum: a.museum.museum_filters.buckets.map(v => {
-      if (v.key === 'Science Museum' || v.key === 'National Railway Museum' || v.key === 'Museum of Science and Industry' || v.key === 'National Media Museum') {
+      if (v.key === 'Science Museum' || v.key === 'National Railway Museum' || v.key === 'Museum of Science and Industry' || v.key === 'National Media Museum' || v.key === 'National Science and Media Museum') {
         return {
           value: v.key,
           // really don't like this 'fix' but can't think of a better (short term) solution?

test/client/end-to-end.clienttest.js

@@ -20,7 +20,7 @@ module.exports = {
       .setValue('input[type=search].searchbox__search', 'charles babbage')
       .pause(1000)
       .click('button.searchbox__submit')
-      .pause(1000)
+      .pause(2000)
       .assert.urlEquals('http://localhost:8000/search?q=charles%20babbage')
       .click('.resultcard')
       .pause(3000)