osm 0.1.17 → 0.2.0

data/spec/osm/grouping_spec.rb

@@ -5,7 +5,7 @@ describe "Grouping" do
 
   describe "Using the API" do
 
-    it "Create" do
+    it "Get for section" do
       body = {'patrols' => [{
         'patrolid' => 1,
         'name' => 'Patrol Name',
@@ -31,6 +31,64 @@ describe "Grouping" do
       patrols.size.should == 0
     end
 
+
+    it "Update in OSM (succeded)" do
+      grouping = Osm::Grouping.new(
+        :id => 1,
+        :section_id => 2,
+        :active => true,
+        :points => 3
+      )
+      grouping.name = 'Grouping'
+
+      url = "https://www.onlinescoutmanager.co.uk/users.php?action=editPatrol&sectionid=#{grouping.section_id}"
+      HTTParty.should_receive(:post).with(url, {:body => {
+        'apiid' => @CONFIGURATION[:api][:osm][:id],
+        'token' => @CONFIGURATION[:api][:osm][:token],
+        'userid' => 'user_id',
+        'secret' => 'secret',
+        'patrolid' => grouping.id,
+        'name' => grouping.name,
+        'active' => grouping.active,
+      }}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>''}) }
+
+      grouping.update(@api).should be_true
+    end
+
+    it "Update points in OSM (succeded)" do
+      grouping = Osm::Grouping.new(
+        :id => 1,
+        :section_id => 2,
+        :active => true,
+        :name => 'Grouping'
+      )
+      grouping.points = 3
+
+      url = "https://www.onlinescoutmanager.co.uk/users.php?action=updatePatrolPoints&sectionid=#{grouping.section_id}"
+      HTTParty.should_receive(:post).with(url, {:body => {
+        'apiid' => @CONFIGURATION[:api][:osm][:id],
+        'token' => @CONFIGURATION[:api][:osm][:token],
+        'userid' => 'user_id',
+        'secret' => 'secret',
+        'patrolid' => grouping.id,
+        'points' => grouping.points,
+      }}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{}'}) }
+
+      grouping.update(@api).should be_true
+    end
+    it "Update in OSM (failed)" do
+      grouping = Osm::Grouping.new(
+        :id => 1,
+        :section_id => 2,
+      )
+      grouping.name = 'Grouping'
+      grouping.points = 3
+      grouping.active = true
+
+      HTTParty.stub(:post) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"done":false}'}) }
+      grouping.update(@api).should be_false
+    end
+
   end
 
 end

data/spec/osm/{evening_spec.rb → meeting_spec.rb}

@@ -2,13 +2,13 @@
 require 'spec_helper'
 require 'date'
 
-describe "Evening" do
+describe "Meeting" do
 
   it "Create" do
-    e = Osm::Evening.new(
+    e = Osm::Meeting.new(
       :id => 1,
       :section_id => 2,
-      :title => 'Evening Name',
+      :title => 'Meeting Name',
       :notes_for_parents => 'Notes for parents',
       :games => 'Games',
       :pre_notes => 'Before',
@@ -16,13 +16,13 @@ describe "Evening" do
       :leaders => 'Leaders',
       :start_time => '19:00',
       :finish_time => '21:00',
-      :meeting_date => Date.new(2000, 01, 02),
+      :date => Date.new(2000, 01, 02),
       :activities => []
     )
 
     e.id.should == 1
     e.section_id.should == 2
-    e.title.should == 'Evening Name'
+    e.title.should == 'Meeting Name'
     e.notes_for_parents.should == 'Notes for parents'
     e.games.should == 'Games'
     e.pre_notes.should == 'Before'
@@ -30,25 +30,25 @@ describe "Evening" do
     e.leaders.should == 'Leaders'
     e.start_time.should == '19:00'
     e.finish_time.should == '21:00'
-    e.meeting_date.should == Date.new(2000, 1, 2)
+    e.date.should == Date.new(2000, 1, 2)
     e.activities.should == []
     e.valid?.should be_true
   end
 
-  it "Sorts by Section ID, Meeting date, Start time and then Evening ID" do
-    evening1 = Osm::Evening.new(:section_id => 1, :id => 1, :meeting_date => (Date.today - 1), :start_time => '18:00')
-    evening2 = Osm::Evening.new(:section_id => 2, :id => 1, :meeting_date => (Date.today - 1), :start_time => '18:00')
-    evening3 = Osm::Evening.new(:section_id => 2, :id => 1, :meeting_date => (Date.today + 1), :start_time => '18:00')
-    evening4 = Osm::Evening.new(:section_id => 2, :id => 1, :meeting_date => (Date.today + 1), :start_time => '19:00')
-    evening5 = Osm::Evening.new(:section_id => 2, :id => 2, :meeting_date => (Date.today + 1), :start_time => '19:00')
+  it "Sorts by Section ID, Meeting date, Start time and then Meeting ID" do
+    meeting1 = Osm::Meeting.new(:section_id => 1, :id => 1, :date => (Date.today - 1), :start_time => '18:00')
+    meeting2 = Osm::Meeting.new(:section_id => 2, :id => 1, :date => (Date.today - 1), :start_time => '18:00')
+    meeting3 = Osm::Meeting.new(:section_id => 2, :id => 1, :date => (Date.today + 1), :start_time => '18:00')
+    meeting4 = Osm::Meeting.new(:section_id => 2, :id => 1, :date => (Date.today + 1), :start_time => '19:00')
+    meeting5 = Osm::Meeting.new(:section_id => 2, :id => 2, :date => (Date.today + 1), :start_time => '19:00')
 
-    data = [evening5, evening3, evening2, evening4, evening1]
-    data.sort.should == [evening1, evening2, evening3, evening4, evening5]
+    data = [meeting5, meeting3, meeting2, meeting4, meeting1]
+    data.sort.should == [meeting1, meeting2, meeting3, meeting4, meeting5]
   end
 
 
-  it "Create Evening::Activity" do
-    ea = Osm::Evening::Activity.new(
+  it "Create Meeting::Activity" do
+    ea = Osm::Meeting::Activity.new(
       :activity_id => 2,
       :title => 'Activity Name',
       :notes => 'Notes',
@@ -72,13 +72,13 @@ describe "Evening" do
       body = {"items" => items, "activities" => activities}
       FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/programme.php?action=getProgramme&sectionid=3&termid=4", :body => body.to_json)
 
-      programme = Osm::Evening.get_programme(@api, 3, 4)
+      programme = Osm::Meeting.get_for_section(@api, 3, 4)
       programme.size.should == 1
-      programme[0].is_a?(Osm::Evening).should be_true
+      programme[0].is_a?(Osm::Meeting).should be_true
       programme[0].activities.size.should == 2
     end
 
-    it "Fetch badge requirements for an evening" do
+    it "Fetch badge requirements for a meeting" do
       badges_body = [{'a'=>'a'},{'a'=>'A'}]
       FakeWeb.register_uri(:post, 'https://www.onlinescoutmanager.co.uk/users.php?action=getActivityRequirements&date=2000-01-02&sectionid=3&section=cubs', :body => badges_body.to_json)
       roles_body = [
@@ -86,11 +86,11 @@ describe "Evening" do
       ]
       FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/api.php?action=getUserRoles", :body => roles_body.to_json)
 
-      evening = Osm::Evening.new(:meeting_date => Date.new(2000, 1, 2), :section_id => 3)
-      evening.get_badge_requirements(@api).should == badges_body
+      meeting = Osm::Meeting.new(:date => Date.new(2000, 1, 2), :section_id => 3)
+      meeting.get_badge_requirements(@api).should == badges_body
     end
 
-    it "Create an evening (succeded)" do
+    it "Create a meeting (succeded)" do
       url = 'https://www.onlinescoutmanager.co.uk/programme.php?action=addActivityToProgramme'
       post_data = {
         'apiid' => @CONFIGURATION[:api][:osm][:id],
@@ -107,22 +107,22 @@ describe "Evening" do
       }
 
       Osm::Term.stub(:get_for_section) { [] }
-      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"result":0}'}) }
-      Osm::Evening.create(@api, {
+      HTTParty.should_receive(:post).with(url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"result":0}'}) }
+      Osm::Meeting.create(@api, {
         :section_id => 1,
-        :meeting_date => Date.new(2000, 1, 2),
+        :date => Date.new(2000, 1, 2),
         :start_time => '11:11',
         :finish_time => '22:22',
         :title => 'Title',
       }).should be_true
     end
 
-    it "Create an evening (failed)" do
+    it "Create a meeting (failed)" do
       Osm::Term.stub(:get_for_section) { [] }
-      HTTParty.should_receive(:post) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'[]'}) }
-      Osm::Evening.create(@api, {
+      HTTParty.should_receive(:post) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'[]'}) }
+      Osm::Meeting.create(@api, {
         :section_id => 1,
-        :meeting_date => Date.new(2000, 1, 2),
+        :date => Date.new(2000, 1, 2),
         :start_time => '11:11',
         :finish_time => '22:22',
         :title => 'Title',
@@ -130,7 +130,7 @@ describe "Evening" do
     end
 
 
-    it "Add activity to evening (succeded)" do
+    it "Add activity to meeting (succeded)" do
       url = 'https://www.onlinescoutmanager.co.uk/programme.php?action=addActivityToProgramme'
       post_data = {
         'apiid' => @CONFIGURATION[:api][:osm][:id],
@@ -144,22 +144,22 @@ describe "Evening" do
       }
 
       Osm::Term.stub(:get_for_section) { [] }
-      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"result":0}'}) }
+      HTTParty.should_receive(:post).with(url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"result":0}'}) }
       activity = Osm::Activity.new(:id => 2, :title => 'Title')
-      evening = Osm::Evening.new(:section_id => 1, :meeting_date => Date.new(2000, 1, 2))
-      evening.add_activity(@api, activity, 'Notes').should be_true
-      evening.activities[0].activity_id.should == 2
+      meeting = Osm::Meeting.new(:section_id => 1, :date => Date.new(2000, 1, 2))
+      meeting.add_activity(@api, activity, 'Notes').should be_true
+      meeting.activities[0].activity_id.should == 2
     end
 
-    it "Add activity to evening (failed)" do
-      HTTParty.should_receive(:post) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"result":1}'}) }
+    it "Add activity to meeting (failed)" do
+      HTTParty.should_receive(:post) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"result":1}'}) }
       activity = Osm::Activity.new(:id => 2, :title => 'Title')
-      evening = Osm::Evening.new(:section_id => 1, :meeting_date => Date.new(2000, 1, 2))
-      evening.add_activity(@api, activity, 'Notes').should be_false
+      meeting = Osm::Meeting.new(:section_id => 1, :date => Date.new(2000, 1, 2))
+      meeting.add_activity(@api, activity, 'Notes').should be_false
     end
 
 
-    it "Update an evening (succeded)" do
+    it "Update a meeting (succeded)" do
       url = 'https://www.onlinescoutmanager.co.uk/programme.php?action=editEvening'
       post_data = {
         'apiid' => @CONFIGURATION[:api][:osm][:id],
@@ -171,13 +171,13 @@ describe "Evening" do
         'postnotes' => '', 'games' => '', 'leaders' => '', 'activity' => '[]',
       }
       Osm::Term.stub(:get_for_section) { [] }
-      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"result":0}'}) }
+      HTTParty.should_receive(:post).with(url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"result":0}'}) }
 
-      evening = Osm::Evening.new(:id=>1, :section_id=>2, :meeting_date=>Date.new(2000, 01, 02))
-      evening.update(@api).should be_true
+      meeting = Osm::Meeting.new(:id=>1, :section_id=>2, :date=>Date.new(2000, 01, 02))
+      meeting.update(@api).should be_true
     end
 
-    it "Update an evening (failed)" do
+    it "Update a meeting (failed)" do
       url = 'https://www.onlinescoutmanager.co.uk/programme.php?action=editEvening'
       post_data = {
         'apiid' => @CONFIGURATION[:api][:osm][:id],
@@ -189,19 +189,19 @@ describe "Evening" do
         'postnotes' => '', 'games' => '', 'leaders' => '', 'activity' => '[]',
       }
       Osm::Term.stub(:get_for_section) { [] }
-      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"result":1}'}) }
+      HTTParty.should_receive(:post).with(url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"result":1}'}) }
 
-      evening = Osm::Evening.new(:id=>1, :section_id=>2, :meeting_date=>Date.new(2000, 01, 02))
-      evening.update(@api).should be_false
+      meeting = Osm::Meeting.new(:id=>1, :section_id=>2, :date=>Date.new(2000, 01, 02))
+      meeting.update(@api).should be_false
     end
 
-    it "Update an evening (invalid evening)" do
-      evening = Osm::Evening.new
-      expect{ evening.update(@api) }.to raise_error(Osm::ObjectIsInvalid)
+    it "Update a meeting (invalid meeting)" do
+      meeting = Osm::Meeting.new
+      expect{ meeting.update(@api) }.to raise_error(Osm::ObjectIsInvalid)
     end
 
 
-    it "Delete an evening" do
+    it "Delete a meeting" do
       url = 'https://www.onlinescoutmanager.co.uk/programme.php?action=deleteEvening&eveningid=1&sectionid=2'
       post_data = {
         'apiid' => @CONFIGURATION[:api][:osm][:id],
@@ -210,10 +210,10 @@ describe "Evening" do
         'secret' => 'secret',
       }
       Osm::Term.stub(:get_for_section) { [] }
-      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>''}) }
+      HTTParty.should_receive(:post).with(url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>''}) }
 
-      evening = Osm::Evening.new(:id=>1, :section_id=>2)
-      evening.delete(@api).should be_true
+      meeting = Osm::Meeting.new(:id=>1, :section_id=>2)
+      meeting.delete(@api).should be_true
     end
 
   end

data/spec/osm/member_spec.rb

@@ -41,7 +41,6 @@ describe "Member" do
       :custom9 => 'Custom Field 9',
       :grouping_id => '3',
       :grouping_leader => 0,
-      :grouping_label => 'Grouping',
       :joined => '2006-01-07',
       :age => '06/07',
       :joined_years => 1,
@@ -83,7 +82,6 @@ describe "Member" do
     member.custom8.should == 'Custom Field 8'
     member.custom9.should == 'Custom Field 9'
     member.grouping_id.should == 3
-    member.grouping_label.should == 'Grouping'
     member.grouping_leader.should == 0
     member.joined.should == Date.new(2006, 1, 7)
     member.age.should == '06/07'
@@ -274,7 +272,7 @@ describe "Member" do
       }
 
       Osm::Term.stub(:get_for_section) { [] }
-      HTTParty.should_receive(:post).with(url, {:body => post_data}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"result":"ok","scoutid":1}'}) }
+      HTTParty.should_receive(:post).with(url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"result":"ok","scoutid":1}'}) }
       member.create(@api).should be_true
       member.id.should == 1
     end
@@ -291,49 +289,48 @@ describe "Member" do
         :grouping_leader => 0,
       )
 
-      HTTParty.should_receive(:post) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"result":"ok","scoutid":-1}'}) }
+      HTTParty.should_receive(:post) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"result":"ok","scoutid":-1}'}) }
       member.create(@api).should be_false
     end
 
 
     it "Update in OSM (succeded)" do
-      member = Osm::Member.new(
-        :id => 1,
-        :section_id => 2,
-        :first_name => 'First',
-        :last_name => 'Last',
-        :email1 => 'email1@example.com',
-        :email2 => 'email2@example.com',
-        :email3 => 'email3@example.com',
-        :email4 => 'email4@example.com',
-        :phone1 => '11111 111111',
-        :phone2 => '222222',
-        :phone3 => '+33 3333 333333',
-        :phone4 => '4444 444 444',
-        :address => '1 Some Road',
-        :address2 => 'Address 2',
-        :date_of_birth => '2000-01-02',
-        :started => '2006-01-02',
-        :joined => '2006-01-03',
-        :parents => 'John and Jane Doe',
-        :notes => 'None',
-        :medical => 'Nothing',
-        :religion => 'Unknown',
-        :school => 'Some School',
-        :ethnicity => 'Yes',
-        :subs => 'Upto end of 2007',
-        :custom1 => 'Custom Field 1',
-        :custom2 => 'Custom Field 2',
-        :custom3 => 'Custom Field 3',
-        :custom4 => 'Custom Field 4',
-        :custom5 => 'Custom Field 5',
-        :custom6 => 'Custom Field 6',
-        :custom7 => 'Custom Field 7',
-        :custom8 => 'Custom Field 8',
-        :custom9 => 'Custom Field 9',
-        :grouping_id => 3,
-        :grouping_leader => 0,
-      )
+      member = Osm::Member.new()
+      member.id = 1
+      member.section_id = 2
+      member.first_name = 'First'
+      member.last_name = 'Last'
+      member.email1 = 'email1@example.com'
+      member.email2 = 'email2@example.com'
+      member.email3 = 'email3@example.com'
+      member.email4 = 'email4@example.com'
+      member.phone1 = '11111 111111'
+      member.phone2 = '222222'
+      member.phone3 = '+33 3333 333333'
+      member.phone4 = '4444 444 444'
+      member.address = '1 Some Road'
+      member.address2 = 'Address 2'
+      member.date_of_birth = '2000-01-02'
+      member.started = '2006-01-02'
+      member.joined = '2006-01-03'
+      member.parents = 'John and Jane Doe'
+      member.notes = 'None'
+      member.medical = 'Nothing'
+      member.religion = 'Unknown'
+      member.school = 'Some School'
+      member.ethnicity = 'Yes'
+      member.subs = 'Upto end of 2007'
+      member.custom1 = 'Custom Field 1'
+      member.custom2 = 'Custom Field 2'
+      member.custom3 = 'Custom Field 3'
+      member.custom4 = 'Custom Field 4'
+      member.custom5 = 'Custom Field 5'
+      member.custom6 = 'Custom Field 6'
+      member.custom7 = 'Custom Field 7'
+      member.custom8 = 'Custom Field 8'
+      member.custom9 = 'Custom Field 9'
+      member.grouping_id = 3
+      member.grouping_leader = 0
 
       url = 'https://www.onlinescoutmanager.co.uk/users.php?action=updateMember&dateFormat=generic'
       body_data = {
@@ -384,7 +381,7 @@ describe "Member" do
             'column' => column,
             'value' => value,
             'sectionid' => member.section_id,
-          }}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>body}) }
+          }}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>body}) }
         end
       end
       HTTParty.should_receive(:post).with('https://www.onlinescoutmanager.co.uk/users.php?action=updateMemberPatrol', {:body => {
@@ -396,7 +393,59 @@ describe "Member" do
         'patrolid' => member.grouping_id,
         'pl' => member.grouping_leader,
         'sectionid' => member.section_id,
-      }}) { DummyHttpResult.new(:response=>{:code=>'200', :body=>body}) }
+      }}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>body}) }
+      Osm::Term.stub(:get_for_section) { [] }
+
+      member.update(@api).should be_true
+    end
+
+    it "Update in OSM (only updated fields)" do
+      member = Osm::Member.new(
+        :id => 1,
+        :section_id => 2,
+        :date_of_birth => '2000-01-02',
+        :started => '2006-01-02',
+        :joined => '2006-01-03',
+        :grouping_leader => 0,
+      )
+      member.first_name = 'First'
+      member.last_name = 'Last'
+      member.grouping_id = 3
+
+      url = 'https://www.onlinescoutmanager.co.uk/users.php?action=updateMember&dateFormat=generic'
+      body_data = {
+        'firstname' => 'First',
+        'lastname' => 'Last',
+        'patrolid' => 3,
+        'patrolleader' => 0,
+      }
+      body = (body_data.inject({}) {|h,(k,v)| h[k]=v.to_s; h}).to_json
+
+      body_data.each do |column, value|
+        unless ['patrolid', 'patrolleader'].include?(column)
+          HTTParty.should_receive(:post).with(url, {:body => {
+            'apiid' => @CONFIGURATION[:api][:osm][:id],
+            'token' => @CONFIGURATION[:api][:osm][:token],
+            'userid' => 'user_id',
+            'secret' => 'secret',
+            'scoutid' => member.id,
+            'column' => column,
+            'value' => value,
+            'sectionid' => member.section_id,
+          }}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>body}) }
+        end
+      end
+      HTTParty.should_receive(:post).with('https://www.onlinescoutmanager.co.uk/users.php?action=updateMemberPatrol', {:body => {
+        'apiid' => @CONFIGURATION[:api][:osm][:id],
+        'token' => @CONFIGURATION[:api][:osm][:token],
+        'userid' => 'user_id',
+        'secret' => 'secret',
+        'scoutid' => member.id,
+        'patrolid' => member.grouping_id,
+        'pl' => member.grouping_leader,
+        'sectionid' => member.section_id,
+      }}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>body}) }
+      Osm::Term.stub(:get_for_section) { [] }
 
       member.update(@api).should be_true
     end
@@ -405,7 +454,6 @@ describe "Member" do
       member = Osm::Member.new(
         :id => 1,
         :section_id => 2,
-        :first_name => 'First',
         :last_name => 'Last',
         :date_of_birth => '2000-01-02',
         :started => '2006-01-02',
@@ -413,11 +461,69 @@ describe "Member" do
         :grouping_id => '3',
         :grouping_leader => 0,
       )
+      member.first_name = 'First'
 
-      HTTParty.stub(:post) { DummyHttpResult.new(:response=>{:code=>'200', :body=>'{}'}) }
+      HTTParty.stub(:post) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{}'}) }
       member.update(@api).should be_false
     end
 
+    describe "Get My.SCOUT link" do
+      
+      before :each do
+        @member = Osm::Member.new(
+          :id => 1,
+          :section_id => 2,
+          :first_name => 'First',
+          :last_name => 'Last',
+          :date_of_birth => '2000-01-02',
+          :started => '2006-01-02',
+          :joined => '2006-01-03',
+          :grouping_id => '3',
+          :grouping_leader => 0,
+        )
+      end
+
+      it "Default" do
+        url = 'https://www.onlinescoutmanager.co.uk/api.php?action=getMyScoutKey&sectionid=2&scoutid=1'
+        HTTParty.should_receive(:post).with(url, {:body => {
+          'apiid' => @CONFIGURATION[:api][:osm][:id],
+          'token' => @CONFIGURATION[:api][:osm][:token],
+          'userid' => 'user_id',
+          'secret' => 'secret',
+        }}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"ok":true,"key":"KEY-HERE"}'}) }
+        @member.myscout_link(@api).should == 'https://www.onlinescoutmanager.co.uk/parents/badges.php?sc=1&se=2&c=KEY-HERE'
+      end
+
+      it "Payments" do
+        url = 'https://www.onlinescoutmanager.co.uk/api.php?action=getMyScoutKey&sectionid=2&scoutid=1'
+        FakeWeb.register_uri(:post, url, :body => '{"ok":true,"key":"KEY-HERE"}')
+        @member.myscout_link(@api, :payments).should == 'https://www.onlinescoutmanager.co.uk/parents/payments.php?sc=1&se=2&c=KEY-HERE'
+      end
+
+      it "Events" do
+        url = 'https://www.onlinescoutmanager.co.uk/api.php?action=getMyScoutKey&sectionid=2&scoutid=1'
+        FakeWeb.register_uri(:post, url, :body => '{"ok":true,"key":"KEY-HERE"}')
+        @member.myscout_link(@api, :events).should == 'https://www.onlinescoutmanager.co.uk/parents/events.php?sc=1&se=2&c=KEY-HERE'
+      end
+
+      it "Programme" do
+        url = 'https://www.onlinescoutmanager.co.uk/api.php?action=getMyScoutKey&sectionid=2&scoutid=1'
+        FakeWeb.register_uri(:post, url, :body => '{"ok":true,"key":"KEY-HERE"}')
+        @member.myscout_link(@api, :programme).should == 'https://www.onlinescoutmanager.co.uk/parents/programme.php?sc=1&se=2&c=KEY-HERE'
+      end
+
+      it "Badges" do
+        url = 'https://www.onlinescoutmanager.co.uk/api.php?action=getMyScoutKey&sectionid=2&scoutid=1'
+        FakeWeb.register_uri(:post, url, :body => '{"ok":true,"key":"KEY-HERE"}')
+        @member.myscout_link(@api, :badges).should == 'https://www.onlinescoutmanager.co.uk/parents/badges.php?sc=1&se=2&c=KEY-HERE'
+      end
+
+      it "Invalid" do
+        expect{ @member.myscout_link(@api, :invalid) }.to raise_error(Osm::ArgumentIsInvalid)
+      end
+
+    end
+
   end
 
 end