diff options
| -rw-r--r-- | app/models/public_body_category.rb | 7 | ||||
| -rw-r--r-- | app/models/public_body_category_link.rb | 9 | ||||
| -rw-r--r-- | app/models/public_body_heading.rb | 3 | ||||
| -rw-r--r-- | spec/controllers/request_controller_spec.rb | 2 | ||||
| -rw-r--r-- | spec/models/holiday_import_spec.rb | 8 | ||||
| -rw-r--r-- | spec/models/public_body_category_link_spec.rb | 9 | ||||
| -rw-r--r-- | spec/models/public_body_category_spec.rb | 8 | ||||
| -rw-r--r-- | spec/models/public_body_heading_spec.rb | 4 |
8 files changed, 22 insertions, 28 deletions
diff --git a/app/models/public_body_category.rb b/app/models/public_body_category.rb index bb83c4c82..c313e5734 100644 --- a/app/models/public_body_category.rb +++ b/app/models/public_body_category.rb @@ -2,11 +2,8 @@ # # Table name: public_body_categories # -# id :integer not null, primary key -# title :text not null -# category_tag :text not null -# description :text not null -# display_order :integer +# id :integer not null, primary key +# category_tag :text not null # require 'forwardable' diff --git a/app/models/public_body_category_link.rb b/app/models/public_body_category_link.rb index ba3ff1f95..8c3eb8060 100644 --- a/app/models/public_body_category_link.rb +++ b/app/models/public_body_category_link.rb @@ -1,10 +1,11 @@ # == Schema Information # -# Table name: public_body_category_link +# Table name: public_body_category_links # -# public_body_category_id :integer not null -# public_body_heading_id :integer not null -# category_display_order :integer +# public_body_category_id :integer not null +# public_body_heading_id :integer not null +# category_display_order :integer +# id :integer not null, primary key # class PublicBodyCategoryLink < ActiveRecord::Base diff --git a/app/models/public_body_heading.rb b/app/models/public_body_heading.rb index f1916d233..f394c37c6 100644 --- a/app/models/public_body_heading.rb +++ b/app/models/public_body_heading.rb @@ -2,8 +2,7 @@ # # Table name: public_body_headings # -# id :integer not null, primary key -# name :text not null +# id :integer not null, primary key # display_order :integer # diff --git a/spec/controllers/request_controller_spec.rb b/spec/controllers/request_controller_spec.rb index ba558cc93..15e252501 100644 --- a/spec/controllers/request_controller_spec.rb +++ b/spec/controllers/request_controller_spec.rb @@ -2660,7 +2660,7 @@ describe RequestController, "#select_authorities" do end - context 'when asked for JSON', :focus => true do + context 'when asked for JSON' do it 'should be successful' do get :select_authorities, {:public_body_query => "Quan", :format => 'json'}, {:user_id => @user.id} diff --git a/spec/models/holiday_import_spec.rb b/spec/models/holiday_import_spec.rb index d0be6fb98..21061f63f 100644 --- a/spec/models/holiday_import_spec.rb +++ b/spec/models/holiday_import_spec.rb @@ -38,8 +38,8 @@ describe HolidayImport do it 'defaults to importing holidays for the current year' do holiday_import = HolidayImport.new - holiday_import.start_year.should == 2014 - holiday_import.end_year.should == 2014 + holiday_import.start_year.should == Time.now.year + holiday_import.end_year.should == Time.now.year end it 'allows the start and end year to be set' do @@ -112,7 +112,9 @@ describe HolidayImport do before do @holiday_import = HolidayImport.new(:source => 'feed', - :ical_feed_url => 'http://www.example.com') + :ical_feed_url => 'http://www.example.com', + :start_year => 2014, + :end_year => 2014) end it 'should populate holidays from the feed that are between the dates' do diff --git a/spec/models/public_body_category_link_spec.rb b/spec/models/public_body_category_link_spec.rb index 8d91f02d5..fd5608480 100644 --- a/spec/models/public_body_category_link_spec.rb +++ b/spec/models/public_body_category_link_spec.rb @@ -1,10 +1,11 @@ # == Schema Information # -# Table name: public_body_category_link +# Table name: public_body_category_links # -# public_body_category_id :integer not null -# public_body_heading_id :integer not null -# category_display_order :integer +# public_body_category_id :integer not null +# public_body_heading_id :integer not null +# category_display_order :integer +# id :integer not null, primary key # require 'spec_helper' diff --git a/spec/models/public_body_category_spec.rb b/spec/models/public_body_category_spec.rb index c185a3169..96fe5686b 100644 --- a/spec/models/public_body_category_spec.rb +++ b/spec/models/public_body_category_spec.rb @@ -2,12 +2,8 @@ # # Table name: public_body_categories # -# id :integer not null, primary key -# locale :string -# title :text not null -# category_tag :text not null -# description :text not null -# display_order :integer +# id :integer not null, primary key +# category_tag :text not null # require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') diff --git a/spec/models/public_body_heading_spec.rb b/spec/models/public_body_heading_spec.rb index add2cac60..9372e0a07 100644 --- a/spec/models/public_body_heading_spec.rb +++ b/spec/models/public_body_heading_spec.rb @@ -2,9 +2,7 @@ # # Table name: public_body_headings # -# id :integer not null, primary key -# locale :string -# name :text not null +# id :integer not null, primary key # display_order :integer # |