osm 1.2.17 → 1.2.18.dev

data/spec/osm/model_spec.rb

@@ -67,12 +67,12 @@ describe "Model" do
 
     it "Checks for existance" do
       OsmTest::Cache.should_receive('exist?').with('OSMAPI-osm-key') { true }
-      ModelTester.cache('exist?', @api, 'key').should be_true
+      ModelTester.cache('exist?', @api, 'key').should == true
     end
 
     it "Writes" do
       OsmTest::Cache.should_receive('write').with('OSMAPI-osm-key', 'data', {:expires_in=>600}) { true }
-      ModelTester.cache('write', @api, 'key', 'data').should be_true
+      ModelTester.cache('write', @api, 'key', 'data').should == true
     end
 
     it "Reads" do
@@ -82,15 +82,15 @@ describe "Model" do
 
     it "Deletes" do
       OsmTest::Cache.should_receive('delete').with('OSMAPI-osm-key') { true }
-      ModelTester.cache('delete', @api, 'key').should be_true
+      ModelTester.cache('delete', @api, 'key').should == true
     end
 
     it "Behaves when cache is nil (no caching)" do
       Osm::Model.configure({:cache => nil})
-      ModelTester.cache('exist?', @api, 'key').should be_false
-      ModelTester.cache('write', @api, 'key', 'data').should be_false
+      ModelTester.cache('exist?', @api, 'key').should == false
+      ModelTester.cache('write', @api, 'key', 'data').should == false
       ModelTester.cache('read', @api, 'key').should be_nil
-      ModelTester.cache('delete', @api, 'key').should be_true
+      ModelTester.cache('delete', @api, 'key').should == true
     end
 
     it "Builds a key from an array" do
@@ -148,33 +148,33 @@ describe "Model" do
     end
 
     it ">" do
-      (@mt1 > @mt2).should be_false
-      (@mt2 > @mt1).should be_true
-      (@mt2 > @mt2a).should be_false
+      (@mt1 > @mt2).should == false
+      (@mt2 > @mt1).should == true
+      (@mt2 > @mt2a).should == false
     end
 
     it ">=" do
-      (@mt1 >= @mt2).should be_false
-      (@mt2 >= @mt1).should be_true
-      (@mt2 >= @mt2a).should be_true
+      (@mt1 >= @mt2).should == false
+      (@mt2 >= @mt1).should == true
+      (@mt2 >= @mt2a).should == true
     end
 
     it "<" do
-      (@mt1 < @mt2).should be_true
-      (@mt2 < @mt1).should be_false
-      (@mt2 < @mt2a).should be_false
+      (@mt1 < @mt2).should == true
+      (@mt2 < @mt1).should == false
+      (@mt2 < @mt2a).should == false
     end
 
     it "<=" do
-      (@mt1 <= @mt2).should be_true
-      (@mt2 <= @mt1).should be_false
-      (@mt2 <= @mt2a).should be_true
+      (@mt1 <= @mt2).should == true
+      (@mt2 <= @mt1).should == false
+      (@mt2 <= @mt2a).should == true
     end
 
     it "between" do
-      @mt2.between?(@mt1, @mt3).should be_true
-      @mt1.between?(@mt1, @mt3).should be_false
-      @mt3.between?(@mt1, @mt3).should be_false
+      @mt2.between?(@mt1, @mt3).should == true
+      @mt1.between?(@mt1, @mt3).should == false
+      @mt3.between?(@mt1, @mt3).should == false
     end
 
   end
@@ -188,15 +188,15 @@ describe "Model" do
       end
 
       it "Has permission" do
-        Osm::Model.user_has_permission?(@api, :bar, :foo, 1).should be_true
+        Osm::Model.user_has_permission?(@api, :bar, :foo, 1).should == true
       end
 
       it "Doesn't have the level of permission" do
-        Osm::Model.user_has_permission?(@api, :barbar, :foo, 1).should be_false
+        Osm::Model.user_has_permission?(@api, :barbar, :foo, 1).should == false
       end
 
       it "Doesn't have access to section" do
-        Osm::Model.user_has_permission?(@api, :bar, :foo, 2).should be_false
+        Osm::Model.user_has_permission?(@api, :bar, :foo, 2).should == false
       end
 
     end
@@ -212,16 +212,16 @@ describe "Model" do
       end
 
       it "Has permission" do
-        Osm::Model.api_has_permission?(@api, :bar, :foo, 1).should be_true
+        Osm::Model.api_has_permission?(@api, :bar, :foo, 1).should == true
       end
 
       it "Doesn't have the level of permission" do
-        Osm::Model.api_has_permission?(@api, :barbar, :foo, 1).should be_false
+        Osm::Model.api_has_permission?(@api, :barbar, :foo, 1).should == false
       end
 
       it "Doesn't have access to the section" do
         Osm::ApiAccess.stub(:get_ours).and_return(nil)
-        Osm::Model.api_has_permission?(@api, :bar, :foo, 2).should be_false
+        Osm::Model.api_has_permission?(@api, :bar, :foo, 2).should == false
       end
 
     end
@@ -233,7 +233,7 @@ describe "Model" do
         options = {:foo => :bar}
         expect(Osm::Model).to receive('user_has_permission?').with(@api, :can_do, :can_to, section, options).and_return(true)
         expect(Osm::Model).to receive('api_has_permission?').with(@api, :can_do, :can_to, section, options).and_return(true)
-        Osm::Model.has_permission?(@api, :can_do, :can_to, section, options).should be_true
+        Osm::Model.has_permission?(@api, :can_do, :can_to, section, options).should == true
       end
 
       describe "Otherwise returns false" do
@@ -241,7 +241,7 @@ describe "Model" do
           it "User #{user ? 'can' : "can't"} and #{api ? 'has' : "hasn't"} given access" do
             Osm::Model.stub('user_has_permission?').and_return(user)
             Osm::Model.stub('api_has_permission?').and_return(api)
-            Osm::Model.has_permission?(@api, :can_do, :can_to, Osm::Section.new).should be_false
+            Osm::Model.has_permission?(@api, :can_do, :can_to, Osm::Section.new).should == false
           end
         end
       end
@@ -255,11 +255,11 @@ describe "Model" do
       end
 
       it "Has access" do
-        Osm::Model.has_access_to_section?(@api, 1).should be_true
+        Osm::Model.has_access_to_section?(@api, 1).should == true
       end
 
       it "Doesn't have access" do
-        Osm::Model.has_access_to_section?(@api, 2).should be_false
+        Osm::Model.has_access_to_section?(@api, 2).should == false
       end 
 
     end

data/spec/osm/register_spec.rb

@@ -15,7 +15,7 @@ describe "Register" do
     field.id.should == 'machine_name'
     field.name.should == 'Human name'
     field.tooltip.should == 'Tooltip'
-    field.valid?.should be_true
+    field.valid?.should == true
   end
 
   it "Sorts Field by id" do
@@ -51,7 +51,7 @@ describe "Register" do
       Date.new(2012, 01, 10) => :yes,
       Date.new(2012, 01, 24) => :unadvised_absent
     }
-    rd.valid?.should be_true
+    rd.valid?.should == true
   end
 
   it "Sorts Attendance by section_id, grouping_id, last_name then first_name" do
@@ -67,16 +67,16 @@ describe "Register" do
 
   it "Reports if a member was present on a date" do
     date = Date.new(2000, 1, 1)
-    Osm::Register::Attendance.new(:attendance => {date => :yes}).present_on?(date).should be_true
-    Osm::Register::Attendance.new(:attendance => {date => :known_absent}).present_on?(date).should be_false
-    Osm::Register::Attendance.new(:attendance => {date => :unknown_absent}).present_on?(date).should be_false
+    Osm::Register::Attendance.new(:attendance => {date => :yes}).present_on?(date).should == true
+    Osm::Register::Attendance.new(:attendance => {date => :known_absent}).present_on?(date).should == false
+    Osm::Register::Attendance.new(:attendance => {date => :unknown_absent}).present_on?(date).should == false
   end
 
   it "Reports if a member was absent on a date" do
     date = Date.new(2000, 1, 1)
-    Osm::Register::Attendance.new(:attendance => {date => :yes}).absent_on?(date).should be_false
-    Osm::Register::Attendance.new(:attendance => {date => :known_absent}).absent_on?(date).should be_true
-    Osm::Register::Attendance.new(:attendance => {date => :unknown_absent}).absent_on?(date).should be_true
+    Osm::Register::Attendance.new(:attendance => {date => :yes}).absent_on?(date).should == false
+    Osm::Register::Attendance.new(:attendance => {date => :known_absent}).absent_on?(date).should == true
+    Osm::Register::Attendance.new(:attendance => {date => :unknown_absent}).absent_on?(date).should == true
   end
 
 
@@ -90,7 +90,7 @@ describe "Register" do
       FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/users.php?action=registerStructure&sectionid=1&termid=2", :body => data.to_json, :content_type => 'application/json')
 
       register_structure = Osm::Register.get_structure(@api, 1, 2)
-      register_structure.is_a?(Array).should be_true
+      register_structure.is_a?(Array).should == true
     end
 
     it "Fetch the register data for a section" do
@@ -117,7 +117,7 @@ describe "Register" do
       ] }
 
       register = Osm::Register.get_attendance(@api, 1, 2)
-      register.is_a?(Array).should be_true
+      register.is_a?(Array).should == true
       register.size.should == 1
       reg = register[0]
       reg.attendance.should == {
@@ -131,7 +131,7 @@ describe "Register" do
       reg.member_id.should == 2
       reg.total.should == 4
       reg.section_id.should == 1
-      reg.valid?.should be_true
+      reg.valid?.should == true
     end
 
     it "Update register attendance" do
@@ -158,7 +158,7 @@ describe "Register" do
         :attendance => :yes,
         :members => 3,
         :completed_badge_requirements => [{'a'=>'A'}, {'b'=>'B'}]
-      }).should be_true
+      }).should == true
     end
 
     it "Handles the total row" do
@@ -186,7 +186,7 @@ describe "Register" do
       Osm::Register.stub(:get_structure) { [] }
 
       register = Osm::Register.get_attendance(@api, 1, 2)
-      register.is_a?(Array).should be_true
+      register.is_a?(Array).should == true
       register.size.should == 1
       reg = register[0]
       reg.first_name.should == 'First'
@@ -196,13 +196,13 @@ describe "Register" do
     it "Handles no data getting structure" do
       FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/users.php?action=registerStructure&sectionid=1&termid=2", :body => '', :content_type => 'application/json')
       register_structure = Osm::Register.get_structure(@api, 1, 2)
-      register_structure.is_a?(Array).should be_true
+      register_structure.is_a?(Array).should == true
       register_structure.size.should == 0
 
 
       FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/users.php?action=register&sectionid=1&termid=2", :body => '', :content_type => 'application/json')
       register = Osm::Register.get_attendance(@api, 1, 2)
-      register.is_a?(Array).should be_true
+      register.is_a?(Array).should == true
       register.size.should == 0
     end
 

data/spec/osm/section_spec.rb

@@ -13,10 +13,6 @@ describe "Section" do
       :subscription_expires => (Date.today + 60).strftime('%Y-%m-%d'),
       :type => :cubs,
       :wizard => false,
-      :column_names => {:column_names => 'names'},
-      :fields => {:fields => true},
-      :intouch_fields => {:intouch_fields => true},
-      :mobile_fields => {:mobile_fields => true},
       :flexi_records => [],
       :group_id => 3,
       :group_name => '3rd Somewhere',
@@ -57,39 +53,35 @@ describe "Section" do
     section.subscription_level.should == 2
     section.subscription_expires.should == Date.today + 60
     section.type.should == :cubs
-    section.column_names.should == {:column_names => 'names'}
-    section.fields.should == {:fields => true}
-    section.intouch_fields.should == {:intouch_fields => true}
-    section.mobile_fields.should == {:mobile_fields => true}
     section.group_id.should == 3
     section.group_name.should == '3rd Somewhere'
     section.flexi_records.should == []
-    section.gocardless.should be_true
+    section.gocardless.should == true
     section.myscout_events_expires.should == Date.today + 61
     section.myscout_badges_expires.should == Date.today + 62
     section.myscout_programme_expires.should == Date.today + 63
     section.myscout_details_expires.should == Date.today + 64
-    section.myscout_events.should be_true
-    section.myscout_badges.should be_true
-    section.myscout_programme.should be_true
-    section.myscout_payments.should be_true
+    section.myscout_events.should == true
+    section.myscout_badges.should == true
+    section.myscout_programme.should == true
+    section.myscout_payments.should == true
     section.myscout_emails.should == {:email1 => true, :email2 => false}
     section.myscout_email_address_from.should == 'send_from@example.com'
     section.myscout_email_address_copy.should == ''
-    section.myscout_badges_partial.should be_true
-    section.myscout_programme_summary.should be_true
-    section.myscout_programme_times.should be_true
+    section.myscout_badges_partial.should == true
+    section.myscout_programme_summary.should == true
+    section.myscout_programme_times.should == true
     section.myscout_programme_show.should == 20
     section.myscout_event_reminder_count.should == 4
     section.myscout_event_reminder_frequency.should == 5
     section.myscout_payment_reminder_count.should == 6
     section.myscout_payment_reminder_frequency.should == 7
-    section.myscout_details.should be_true
+    section.myscout_details.should == true
     section.myscout_details_email_changes_to.should == 'notify-changes-to@example.com'
-    section.sms_sent_test.should be_true
+    section.sms_sent_test.should == true
     section.sms_messages_sent.should == 8
     section.sms_messages_remaining.should == 9
-    section.valid?.should be_true
+    section.valid?.should == true
   end
 
 
@@ -99,16 +91,12 @@ describe "Section" do
     section.subscription_level.should == 1
     section.subscription_expires.should be_nil
     section.type.should == :unknown
-    section.column_names.should == {}
-    section.fields.should == {}
-    section.intouch_fields.should == {}
-    section.mobile_fields.should == {}
     section.flexi_records.should == []
     section.myscout_email_address_from.should == ''
     section.myscout_email_address_copy.should == ''
     section.myscout_details_email_changes_to.should == ''
     section.myscout_programme_show.should == 0
-    section.sms_sent_test.should be_false
+    section.sms_sent_test.should == false
     section.sms_messages_sent.should == 0
     section.sms_messages_remaining.should == 0
   end
@@ -135,41 +123,37 @@ describe "Section" do
         section.subscription_level.should == 1
         section.subscription_expires.should == Date.new(2013, 1, 5)
         section.type.should == :beavers
-        section.column_names.should == {:column_names => 'names'}
-        section.fields.should == {:fields => true}
-        section.intouch_fields.should == {:intouch_fields => true}
-        section.mobile_fields.should == {:mobile_fields => true}
         section.group_id.should == 3
         section.group_name.should == '3rd Somewhere'
         section.flexi_records.size.should == 1
         section.flexi_records[0].id.should == 111
         section.flexi_records[0].name.should == 'Flexi Record 1'
-        section.gocardless.should be_true
+        section.gocardless.should == true
         section.myscout_events_expires.should == Date.new(2013, 1, 6)
         section.myscout_badges_expires.should == Date.new(2013, 1, 7)
         section.myscout_programme_expires.should == Date.new(2013, 1, 8)
         section.myscout_programme_show.should == 10
         section.myscout_details_expires.should == Date.new(2013, 1, 9)
-        section.myscout_events.should be_true
-        section.myscout_badges.should be_true
-        section.myscout_programme.should be_true
-        section.myscout_payments.should be_true
+        section.myscout_events.should == true
+        section.myscout_badges.should == true
+        section.myscout_programme.should == true
+        section.myscout_payments.should == true
         section.myscout_emails.should == {:email1 => true, :email2 => false}
         section.myscout_email_address_from.should == 'send_from@example.com'
         section.myscout_email_address_copy.should == ''
-        section.myscout_badges_partial.should be_true
-        section.myscout_programme_summary.should be_true
-        section.myscout_programme_times.should be_true
+        section.myscout_badges_partial.should == true
+        section.myscout_programme_summary.should == true
+        section.myscout_programme_times.should == true
         section.myscout_event_reminder_count.should == 4
         section.myscout_event_reminder_frequency.should == 5
         section.myscout_payment_reminder_count.should == 6
         section.myscout_payment_reminder_frequency.should == 7
-        section.myscout_details.should be_true
+        section.myscout_details.should == true
         section.myscout_details_email_changes_to.should == 'notify-changes-to@example.com'
-        section.sms_sent_test.should be_true
+        section.sms_sent_test.should == true
         section.sms_messages_remaining.should == 8
         section.sms_messages_sent.should == 9
-        section.valid?.should be_true
+        section.valid?.should == true
       end
 
       it "From cache" do
@@ -183,7 +167,7 @@ describe "Section" do
       section = Osm::Section.get(@api, 1)
       section.should_not be_nil
       section.id.should == 1
-      section.valid?.should be_true
+      section.valid?.should == true
     end
 
 
@@ -211,13 +195,13 @@ describe "Section" do
       }
       HTTParty.should_receive(:post).with(url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"ok":true}'}) }
       section = Osm::Section.new(:id => 1)
-      section.set_notepad(@api, 'content').should be_true
+      section.set_notepad(@api, 'content').should == true
     end
 
     it "Sets the section's notepad (fail)" do
       HTTParty.should_receive(:post) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"ok":false}'}) }
       section = Osm::Section.new(:id => 1)
-      section.set_notepad(@api, 'content').should be_false
+      section.set_notepad(@api, 'content').should == false
     end
 
   end
@@ -285,12 +269,12 @@ describe "Section" do
 
     [beavers, cubs, scouts, explorers].each do |section|
       it "For a #{section.type} section" do
-        section.youth_section?.should be_true
+        section.youth_section?.should == true
       end
     end
     [network, adults, waiting, unknown].each do |section|
       it "For a #{section.type} section" do
-        section.youth_section?.should be_false
+        section.youth_section?.should == false
       end
     end
   end
@@ -429,33 +413,6 @@ describe "Online Scout Manager API Strangeness" do
     sections[0].should_not be_nil
   end
 
-  it "handles a section config where fields is an empty array" do
-    body = '[{"sectionConfig":"{\"subscription_level\":3,\"subscription_expires\":\"2013-01-05\",\"columnNames\":{\"phone1\":\"Home Phone\",\"phone2\":\"Parent 1 Phone\",\"address\":\"Member\'s Address\",\"phone3\":\"Parent 2 Phone\",\"address2\":\"Address 2\",\"phone4\":\"Alternate Contact Phone\",\"subs\":\"Gender\",\"email1\":\"Parent 1 Email\",\"medical\":\"Medical / Dietary\",\"email2\":\"Parent 2 Email\",\"ethnicity\":\"Gift Aid\",\"email3\":\"Member\'s Email\",\"religion\":\"Religion\",\"email4\":\"Email 4\",\"school\":\"School\"},\"numscouts\":10,\"hasUsedBadgeRecords\":true,\"hasProgramme\":true,\"extraRecords\":[{\"name\":\"Subs\",\"extraid\":\"529\"}],\"wizard\":\"false\",\"fields\":[],\"intouch\":{\"address\":true,\"address2\":false,\"email1\":false,\"email2\":false,\"email3\":false,\"email4\":false,\"phone1\":true,\"phone2\":true,\"phone3\":true,\"phone4\":true,\"medical\":false},\"mobFields\":{\"email1\":false,\"email2\":false,\"email3\":false,\"email4\":false,\"address\":true,\"address2\":false,\"phone1\":true,\"phone2\":true,\"phone3\":true,\"phone4\":true,\"school\":false,\"religion\":false,\"ethnicity\":true,\"medical\":true,\"patrol\":true,\"subs\":false}}","groupname":"1st Somewhere","groupid":"1","groupNormalised":"1","sectionid":"1","sectionname":"Section 1","section":"cubs","isDefault":"1","permissions":{"badge":100,"member":100,"user":100,"register":100,"contact":100,"programme":100,"originator":1,"events":100,"finance":100,"flexi":100}}]'
-    FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/api.php?action=getUserRoles", :body => body, :content_type => 'application/json')
-
-    sections = Osm::Section.get_all(@api)
-    sections.size.should == 1
-    section = sections[0]
-    section.should_not be_nil
-    section.fields.should == {}
-  end
-
-  it "handles a section's flexi records being a hash" do
-    body = [
-      {"sectionConfig"=>"{\"subscription_level\":1,\"subscription_expires\":\"2013-01-05\",\"sectionType\":\"beavers\",\"columnNames\":{\"phone1\":\"Home Phone\",\"phone2\":\"Parent 1 Phone\",\"address\":\"Member's Address\",\"phone3\":\"Parent 2 Phone\",\"address2\":\"Address 2\",\"phone4\":\"Alternate Contact Phone\",\"subs\":\"Gender\",\"email1\":\"Parent 1 Email\",\"medical\":\"Medical / Dietary\",\"email2\":\"Parent 2 Email\",\"ethnicity\":\"Gift Aid\",\"email3\":\"Member's Email\",\"religion\":\"Religion\",\"email4\":\"Email 4\",\"school\":\"School\"},\"numscouts\":10,\"hasUsedBadgeRecords\":true,\"hasProgramme\":true,\"extraRecords\":{\"1\":{\"name\":\"Flexi Record 1\",\"extraid\":\"1\"},\"2\":{\"name\":\"Flexi Record 2\",\"extraid\":\"2\"}},\"wizard\":\"false\",\"fields\":{\"email1\":true,\"email2\":true,\"email3\":true,\"email4\":false,\"address\":true,\"address2\":false,\"phone1\":true,\"phone2\":true,\"phone3\":true,\"phone4\":true,\"school\":false,\"religion\":true,\"ethnicity\":true,\"medical\":true,\"patrol\":true,\"subs\":true,\"saved\":true},\"intouch\":{\"address\":true,\"address2\":false,\"email1\":false,\"email2\":false,\"email3\":false,\"email4\":false,\"phone1\":true,\"phone2\":true,\"phone3\":true,\"phone4\":true,\"medical\":false},\"mobFields\":{\"email1\":false,\"email2\":false,\"email3\":false,\"email4\":false,\"address\":true,\"address2\":false,\"phone1\":true,\"phone2\":true,\"phone3\":true,\"phone4\":true,\"school\":false,\"religion\":false,\"ethnicity\":true,\"medical\":true,\"patrol\":true,\"subs\":false}}", "groupname"=>"3rd Somewhere", "groupid"=>"3", "groupNormalised"=>"1", "sectionid"=>"1", "sectionname"=>"Section 1", "section"=>"beavers", "isDefault"=>"1", "permissions"=>{"badge"=>100, "member"=>100, "user"=>100, "register"=>100, "contact"=>100, "programme"=>100, "originator"=>1, "events"=>100, "finance"=>100, "flexi"=>100}},
-    ]
-    FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/api.php?action=getUserRoles", :body => body.to_json, :content_type => 'application/json')
-
-    sections = Osm::Section.get_all(@api)
-    sections.size.should == 1
-    section = sections[0]
-    section.should_not be_nil
-    section.flexi_records.size.should == 2
-    fr = section.flexi_records[0]
-    fr.id.should == 1
-    fr.name.should == 'Flexi Record 1'
-  end
-
   it "handles an empty array representing no notepads" do
     body = [{"sectionConfig"=>"{\"subscription_level\":1,\"subscription_expires\":\"2013-01-05\",\"sectionType\":\"beavers\",\"columnNames\":{\"column_names\":\"names\"},\"numscouts\":10,\"hasUsedBadgeRecords\":true,\"hasProgramme\":true,\"extraRecords\":[{\"name\":\"Flexi Record 1\",\"extraid\":\"111\"}],\"wizard\":\"false\",\"fields\":{\"fields\":true},\"intouch\":{\"intouch_fields\":true},\"mobFields\":{\"mobile_fields\":true}}", "groupname"=>"3rd Somewhere", "groupid"=>"3", "groupNormalised"=>"1", "sectionid"=>"1", "sectionname"=>"Section 1", "section"=>"beavers", "isDefault"=>"1", "permissions"=>{"badge"=>10, "member"=>20, "user"=>100, "register"=>100, "contact"=>100, "programme"=>100, "originator"=>1, "events"=>100, "finance"=>100, "flexi"=>100}}]
     FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/api.php?action=getUserRoles", :body => body.to_json, :content_type => 'application/json')