Merge branch 'master' of https://github.com/sandbergja/discovery_layer

app/controllers/catalog_controller.rb

@@ -98,6 +98,7 @@ class CatalogController < ApplicationController
     config.add_facet_field 'subject_era_facet', :label => 'Era of focus', :limit => true, :sort => 'count'
     config.add_facet_field 'subject_name_facet', :label => 'People and groups', :limit => true, :sort => 'count'
     config.add_facet_field 'genre_facet', :label => 'Genre', :limit => true, :sort => 'count'
+    config.add_facet_field 'series_facet', :label => 'Series', :limit => true, :sort => 'count'
     config.add_facet_field 'record_source_facet', :label => 'Source database', :limit => true
 
 =begin

app/models/article_search.rb

@@ -8,6 +8,12 @@ def enough_data_exists_in(record)
         return true
     end
 
+    # Create a new search object
+    #
+    # q: a query string
+    # page: a page number (can be an int or string)
+    # requested_facets: an array
+    # api_connection: and ApiConnection object or one of its descendants
     def initialize(q, page, requested_facets = [], api_connection)
         @q = q
         @page = page

test/models/article_search_test.rb

@@ -1,7 +1,11 @@
 require 'test_helper'
 
+
 class ArticleSearchTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
+
+  test "Article Search search_opts method returns an array" do
+    a = ArticleSearch.new 'soap opera', 3, [], nil
+    assert_instance_of Array, a.search_opts
+  end
+
 end