pandarus 0.6.2 → 0.6.3

data/lib/pandarus/version.rb

@@ -1,3 +1,3 @@
 module Pandarus
-  VERSION = '0.6.2' unless defined?(Pandarus::VERSION)
+  VERSION = '0.6.3' unless defined?(Pandarus::VERSION)
 end

data/pandarus.gemspec

@@ -21,11 +21,12 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "bundler", ">= 1.0.0"
-  gem.add_development_dependency "rspec", "~> 2.6"
+  gem.add_development_dependency "rspec", "~> 3.0"
   gem.add_development_dependency "webmock"
+  gem.add_development_dependency "vcr"
   gem.add_development_dependency "pry"
 
-  gem.add_dependency "footrest", "0.4.1"
+  gem.add_dependency "footrest", '~> 0.5.0'
   gem.add_dependency "activesupport", ">= 3.0.0"
   gem.add_dependency "virtus", ">= 1.0.3"
   gem.add_dependency "inflecto", ">= 0.0.2"

data/spec/api_base_spec.rb

@@ -10,16 +10,15 @@ describe Pandarus::APIBase do
     end
 
     it "converts surrounding double underscores" do
-      u2sb("prefix__inside__").should == :"prefix[inside]"
+      expect(u2sb("prefix__inside__")).to eq :"prefix[inside]"
     end
 
     it "ignores single underscores" do
-      u2sb("prefix__inner_word__").should == :"prefix[inner_word]"
+      expect(u2sb("prefix__inner_word__")).to eq :"prefix[inner_word]"
     end
 
     it "converts multiple double underscores" do
-      u2sb("prefix__alpha____beta_gamma__").should ==
-        :"prefix[alpha][beta_gamma]"
+      expect(u2sb("prefix__alpha____beta_gamma__")).to eq :"prefix[alpha][beta_gamma]"
     end
   end
 
@@ -93,4 +92,4 @@ describe Pandarus::APIBase do
     end
 
   end
-end
+end

data/spec/client_spec.rb

@@ -11,21 +11,7 @@ describe Pandarus::Client do
     let(:opts) { { :prefix => prefix, :token => token } }
 
     it "raises when args are too few" do
-      lambda { client.list_account_admins }.should raise_error
-    end
-
-    it "does not raise when args are correct" do
-      stub_json_request("http://localhost:3000/api/v1/accounts/1/admins", "[]")
-      lambda { client.list_account_admins(1) }.should_not raise_error
-    end
-  end
-
-  context "with overridden params" do
-    let(:opts) { { :account_id => 1, :prefix => prefix, :token => token } }
-
-    it "uses overridden param account_id" do
-      stub_json_request("http://localhost:3000/api/v1/accounts/1/admins", "[]")
-      lambda { client.list_account_admins }.should_not raise_error
+      expect { client.list_account_admins }.to raise_error
     end
   end
 
@@ -39,4 +25,4 @@ describe Pandarus::Client do
         }
     )
   end
-end
+end

data/spec/fixtures/vcr_cassettes/remote_collection_all_pages.yml

@@ -0,0 +1,211 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://shard1.canvas.dev/api/v1/courses/14/users?enrollment_type=student
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - application/json
+      Authorization:
+      - Bearer Bearer 1~A5dY8IsOyhVOVRJi4V3XWGNsa7pzuIbdM8OCv62YTRFqOsiS9vX0NbtY8PR9q4pX
+      User-Agent:
+      - Footrest
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Canvas-User-Id:
+      - '10000000000001'
+      Link:
+      - <http://shard1.canvas.dev/api/v1/courses/14/users?enrollment_type=student&page=1&per_page=10>;
+        rel="current",<http://shard1.canvas.dev/api/v1/courses/14/users?enrollment_type=student&page=2&per_page=10>;
+        rel="next",<http://shard1.canvas.dev/api/v1/courses/14/users?enrollment_type=student&page=1&per_page=10>;
+        rel="first",<http://shard1.canvas.dev/api/v1/courses/14/users?enrollment_type=student&page=3&per_page=10>;
+        rel="last"
+      X-Frame-Options:
+      - SAMEORIGIN
+      Content-Type:
+      - application/json; charset=utf-8
+      X-Ua-Compatible:
+      - IE=Edge
+      Etag:
+      - '"d8494ce40b4b8be8addbb736bfd1c333"'
+      Cache-Control:
+      - must-revalidate, private, max-age=0
+      Set-Cookie:
+      - _csrf_token=HmhMEGEdhhvRVlnYZLXTwyIGYGjuWeQ68xUPSiAd5vt6GQdXBUXDLL0jOIkGgrqzWEhZKaQTnF3CVFolV0mTzg%3D%3D;
+        path=/
+      - _normandy_session=cP7mYMVZ0cCgO7RmBD_99w.5oUsKA4C4mkJk-l49huIqeHphIh-b8Gq1yRT8B9cvpBCTSTSGbICDIbmnIKlZX_Y76DZTEfDSLeyzDuyzECfmLPXW86Z22X6rmTroYwMeAt5ym_3khrSJGefEypDw6Hd.fKoO7AdPLd-swV8VPxGDeHz_SBg.VJLvJg;
+        path=/; HttpOnly
+      X-Session-Id:
+      - ac19512a3ac594145f0b4c21095275e6
+      X-Request-Context-Id:
+      - 6079e1c0-68f6-0132-4d7c-38e85630c82a
+      X-Canvas-Meta:
+      - a=1;g=DtbEcIgsiKSxJvSoQKH05C46ONAcwvepb4BEBYAz;s=2;c=development;b=328036;m=328036;u=0.22;y=0.02;d=0.01;
+      X-Runtime:
+      - '0.261794'
+      Date:
+      - Thu, 18 Dec 2014 15:13:42 GMT
+      X-Rack-Cache:
+      - miss
+      Connection:
+      - close
+    body:
+      encoding: UTF-8
+      string: '[{"id":154,"name":"Brandon Adams","sortable_name":"Adams, Brandon","short_name":"Brandon
+        Adams","sis_user_id":"student_4471","integration_id":null,"sis_login_id":"westudent1","sis_import_id":4,"login_id":"westudent1"},{"id":126,"name":"Barry
+        Blankenship","sortable_name":"Blankenship, Barry","short_name":"Barry Blankenship","sis_user_id":"student_4443","integration_id":null,"sis_login_id":"westudent38","sis_import_id":4,"login_id":"westudent38"},{"id":109,"name":"Rachel
+        Brown","sortable_name":"Brown, Rachel","short_name":"Rachel Brown","sis_user_id":"student_4426","integration_id":null,"sis_login_id":"westudent63","sis_import_id":4,"login_id":"westudent63"},{"id":130,"name":"Riley
+        Brown","sortable_name":"Brown, Riley","short_name":"Riley Brown","sis_user_id":"student_4447","integration_id":null,"sis_login_id":"westudent64","sis_import_id":4,"login_id":"westudent64"},{"id":475,"name":"James
+        Dandy","sortable_name":"Dandy, James","short_name":"James Dandy","sis_user_id":"student_17972","integration_id":null,"sis_login_id":"0de2754a2a2caccc","sis_import_id":4,"login_id":"0de2754a2a2caccc"},{"id":110,"name":"Julie
+        Davis","sortable_name":"Davis, Julie","short_name":"Julie Davis","sis_user_id":"student_4427","integration_id":null,"sis_login_id":"westudent95","sis_import_id":4,"login_id":"westudent95"},{"id":105,"name":"Amber
+        Gray","sortable_name":"Gray, Amber","short_name":"Amber Gray","sis_user_id":"student_4422","integration_id":null,"sis_login_id":"48f6dd84e760c710","sis_import_id":4,"login_id":"48f6dd84e760c710"},{"id":119,"name":"Anthony
+        Gustin","sortable_name":"Gustin, Anthony","short_name":"Anthony Gustin","sis_user_id":"student_4436","integration_id":null,"sis_login_id":"westudent166","sis_import_id":4,"login_id":"westudent166"},{"id":142,"name":"Jonathan
+        Holland","sortable_name":"Holland, Jonathan","short_name":"Jonathan Holland","sis_user_id":"student_4459","integration_id":null,"sis_login_id":"westudent215","sis_import_id":4,"login_id":"westudent215"},{"id":91,"name":"Corey
+        Kelly","sortable_name":"Kelly, Corey","short_name":"Corey Kelly","sis_user_id":"student_4408","integration_id":null,"sis_login_id":"westudent259","sis_import_id":4,"login_id":"westudent259"}]'
+    http_version: 
+  recorded_at: Thu, 18 Dec 2014 15:13:42 GMT
+- request:
+    method: get
+    uri: http://shard1.canvas.dev/api/v1/courses/14/users?enrollment_type=student&page=2&per_page=10
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - application/json
+      Authorization:
+      - Bearer Bearer 1~A5dY8IsOyhVOVRJi4V3XWGNsa7pzuIbdM8OCv62YTRFqOsiS9vX0NbtY8PR9q4pX
+      User-Agent:
+      - Footrest
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Canvas-User-Id:
+      - '10000000000001'
+      Link:
+      - <http://shard1.canvas.dev/api/v1/courses/14/users?enrollment_type=student&page=2&per_page=10>;
+        rel="current",<http://shard1.canvas.dev/api/v1/courses/14/users?enrollment_type=student&page=3&per_page=10>;
+        rel="next",<http://shard1.canvas.dev/api/v1/courses/14/users?enrollment_type=student&page=1&per_page=10>;
+        rel="prev",<http://shard1.canvas.dev/api/v1/courses/14/users?enrollment_type=student&page=1&per_page=10>;
+        rel="first",<http://shard1.canvas.dev/api/v1/courses/14/users?enrollment_type=student&page=3&per_page=10>;
+        rel="last"
+      X-Frame-Options:
+      - SAMEORIGIN
+      Content-Type:
+      - application/json; charset=utf-8
+      X-Ua-Compatible:
+      - IE=Edge
+      Etag:
+      - '"75c1a350d18501f6912e575a6bbc53c1"'
+      Cache-Control:
+      - must-revalidate, private, max-age=0
+      Set-Cookie:
+      - _csrf_token=EKCSPyXN2cjUagWmSyxnJaxR8U8sEwoH%2BOK%2BsSftt2ldytoOR4iA464kSZcqS18X32KgFm84PlPPluvGcNWYMw%3D%3D;
+        path=/
+      - _normandy_session=H9dHgxOeRFp2LKwSrTNzIQ.I42HWwvEwVQ5buNUmA5dvXpAQ5ZVRmlJY3nR57DrpIwxt7DhfRP3lqo99GPyQBz_ZAkKHBQm2CSzGpIsUl7-9wpmgWa4rH-c-eZZf7rIp4gZuviyFtISh8ialNkhn7ZU.P4ihNStsDB5-nXi_LTU-7jxG30c.VJLvJw;
+        path=/; HttpOnly
+      X-Session-Id:
+      - bdc07fdf3be919cbe7499e043e699c6e
+      X-Request-Context-Id:
+      - 60a38680-68f6-0132-4d7c-38e85630c82a
+      X-Canvas-Meta:
+      - a=1;g=DtbEcIgsiKSxJvSoQKH05C46ONAcwvepb4BEBYAz;s=2;c=development;b=328036;m=329924;u=0.43;y=0.02;d=0.01;
+      X-Runtime:
+      - '0.482755'
+      Date:
+      - Thu, 18 Dec 2014 15:13:43 GMT
+      X-Rack-Cache:
+      - miss
+      Connection:
+      - close
+    body:
+      encoding: UTF-8
+      string: '[{"id":77,"name":"Rachelle Kemink","sortable_name":"Kemink, Rachelle","short_name":"Rachelle
+        Kemink","sis_user_id":"student_4394","integration_id":null,"sis_login_id":"40dfec16918a9989","sis_import_id":4,"login_id":"40dfec16918a9989"},{"id":102,"name":"Jacob
+        Lock","sortable_name":"Lock, Jacob","short_name":"Jacob Lock","sis_user_id":"student_4419","integration_id":null,"sis_login_id":"westudent293","sis_import_id":4,"login_id":"westudent293"},{"id":124,"name":"Patti,K.
+        Mccoy","sortable_name":"Mccoy, Patti,K.","short_name":"Patti,K. Mccoy","sis_user_id":"student_4441","integration_id":null,"sis_login_id":"westudent317","sis_import_id":4,"login_id":"westudent317"},{"id":114,"name":"Alyssa
+        Miasnik","sortable_name":"Miasnik, Alyssa","short_name":"Alyssa Miasnik","sis_user_id":"student_4431","integration_id":null,"sis_login_id":"westudent323","sis_import_id":4,"login_id":"westudent323"},{"id":144,"name":"Carlos
+        Nielsen","sortable_name":"Nielsen, Carlos","short_name":"Carlos Nielsen","sis_user_id":"student_4461","integration_id":null,"sis_login_id":"westudent360","sis_import_id":4,"login_id":"westudent360"},{"id":84,"name":"Matthew
+        Ponchai","sortable_name":"Ponchai, Matthew","short_name":"Matthew Ponchai","sis_user_id":"student_4401","integration_id":null,"sis_login_id":"westudent398","sis_import_id":4,"login_id":"westudent398"},{"id":81,"name":"Tom
+        Riley","sortable_name":"Riley, Tom","short_name":"Tom Riley","sis_user_id":"student_4398","integration_id":null,"sis_login_id":"westudent417","sis_import_id":4,"login_id":"westudent417"},{"id":118,"name":"Frank
+        Segura","sortable_name":"Segura, Frank","short_name":"Frank Segura","sis_user_id":"student_4435","integration_id":null,"sis_login_id":"westudent438","sis_import_id":4,"login_id":"westudent438"},{"id":125,"name":"Stephenson
+        Watts","sortable_name":"Watts, Stephenson","short_name":"Stephenson Watts","sis_user_id":"student_4442","integration_id":null,"sis_login_id":"westudent496","sis_import_id":4,"login_id":"westudent496"},{"id":115,"name":"Britney
+        Whittle","sortable_name":"Whittle, Britney","short_name":"Britney Whittle","sis_user_id":"student_4432","integration_id":null,"sis_login_id":"westudent504","sis_import_id":4,"login_id":"westudent504"}]'
+    http_version: 
+  recorded_at: Thu, 18 Dec 2014 15:13:43 GMT
+- request:
+    method: get
+    uri: http://shard1.canvas.dev/api/v1/courses/14/users?enrollment_type=student&page=3&per_page=10
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - application/json
+      Authorization:
+      - Bearer Bearer 1~A5dY8IsOyhVOVRJi4V3XWGNsa7pzuIbdM8OCv62YTRFqOsiS9vX0NbtY8PR9q4pX
+      User-Agent:
+      - Footrest
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Canvas-User-Id:
+      - '10000000000001'
+      Link:
+      - <http://shard1.canvas.dev/api/v1/courses/14/users?enrollment_type=student&page=3&per_page=10>;
+        rel="current",<http://shard1.canvas.dev/api/v1/courses/14/users?enrollment_type=student&page=2&per_page=10>;
+        rel="prev",<http://shard1.canvas.dev/api/v1/courses/14/users?enrollment_type=student&page=1&per_page=10>;
+        rel="first",<http://shard1.canvas.dev/api/v1/courses/14/users?enrollment_type=student&page=3&per_page=10>;
+        rel="last"
+      X-Frame-Options:
+      - SAMEORIGIN
+      Content-Type:
+      - application/json; charset=utf-8
+      X-Ua-Compatible:
+      - IE=Edge
+      Etag:
+      - '"fdcf93820992101b1ec6375b7d9ed8bd"'
+      Cache-Control:
+      - must-revalidate, private, max-age=0
+      Set-Cookie:
+      - _csrf_token=euTKz%2FVNURj4NjFMmxl9Cj7GbrsS%2FmZIkaZGH3aHqbUyqJy1hg4oXZluexneaRBLV55ByErLSWPo%2FjNNIvXsgw%3D%3D;
+        path=/
+      - _normandy_session=4H57XVZatJMTTHBTSz0XXg.KJo0W_Gnid9O7o93o7D0B0JXYKU_0DYjX3p5F9mu-e4jYDfeb6xGLjDIgeNmOgsH3RfmC93cFnqnoWl_VNS0F_LwZM6rgmtqWmyXSZYD2G-4Zyi1tL7FP95RBddu6MnT.8pSpRuwegl1mhR3wIZjeSFWPIzs.VJLvJw;
+        path=/; HttpOnly
+      X-Session-Id:
+      - 62e9e75f213e4a7d5cc91786fea42c90
+      X-Request-Context-Id:
+      - 60ef8850-68f6-0132-4d7c-38e85630c82a
+      X-Canvas-Meta:
+      - a=1;g=DtbEcIgsiKSxJvSoQKH05C46ONAcwvepb4BEBYAz;s=2;c=development;b=329924;m=329968;u=0.20;y=0.02;d=0.01;
+      X-Runtime:
+      - '0.237708'
+      Date:
+      - Thu, 18 Dec 2014 15:13:43 GMT
+      X-Rack-Cache:
+      - miss
+      Connection:
+      - close
+    body:
+      encoding: UTF-8
+      string: '[{"id":108,"name":"Jessy Young","sortable_name":"Young, Jessy","short_name":"Jessy
+        Young","sis_user_id":"student_4425","integration_id":null,"sis_login_id":"westudent520","sis_import_id":4,"login_id":"westudent520"}]'
+    http_version: 
+  recorded_at: Thu, 18 Dec 2014 15:13:43 GMT
+recorded_with: VCR 2.9.3

data/spec/fixtures/vcr_cassettes/remote_collection_first_page.yml

@@ -0,0 +1,69 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://shard1.canvas.dev/api/v1/courses/14/users?enrollment_type=student&per_page=4
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - application/json
+      Authorization:
+      - Bearer Bearer 1~A5dY8IsOyhVOVRJi4V3XWGNsa7pzuIbdM8OCv62YTRFqOsiS9vX0NbtY8PR9q4pX
+      User-Agent:
+      - Footrest
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      X-Canvas-User-Id:
+      - '10000000000001'
+      Link:
+      - <http://shard1.canvas.dev/api/v1/courses/14/users?enrollment_type=student&page=1&per_page=4>;
+        rel="current",<http://shard1.canvas.dev/api/v1/courses/14/users?enrollment_type=student&page=2&per_page=4>;
+        rel="next",<http://shard1.canvas.dev/api/v1/courses/14/users?enrollment_type=student&page=1&per_page=4>;
+        rel="first",<http://shard1.canvas.dev/api/v1/courses/14/users?enrollment_type=student&page=6&per_page=4>;
+        rel="last"
+      X-Frame-Options:
+      - SAMEORIGIN
+      Content-Type:
+      - application/json; charset=utf-8
+      X-Ua-Compatible:
+      - IE=Edge
+      Etag:
+      - '"4a4e3f62b00b4b6aff8936702c1cb2d8"'
+      Cache-Control:
+      - must-revalidate, private, max-age=0
+      Set-Cookie:
+      - _csrf_token=%2BD8NttV7evZgJBGpwIu2Op7orFDLkb6CdirKkZvZb4G8SX3jpD4zjjlGfsCJzuxX2bD4A63ii%2B0ubLjw9bslsw%3D%3D;
+        path=/
+      - _normandy_session=mxm4xsQUFwSJwPzOvD0PmQ.YyTzeKM2EWKw_POuu05sotuV3B5rGX66WxMgjG_4A_aJVvOiOOY6xvUYCCf4uoseJ78j7NqpOZzKLBXEgx0I7LG1tOUJdje8Y6tT7rXozQH6DagzE_MPxhwpYdcbrftU.KrBLNNsZg2h8z3H0KDtrRf3DZTA.VJLvJw;
+        path=/; HttpOnly
+      X-Session-Id:
+      - 5b59731950aae9f1f06f6247662ff3c3
+      X-Request-Context-Id:
+      - 6116df30-68f6-0132-4d7c-38e85630c82a
+      X-Canvas-Meta:
+      - a=1;g=DtbEcIgsiKSxJvSoQKH05C46ONAcwvepb4BEBYAz;s=2;c=development;b=329968;m=330416;u=0.20;y=0.01;d=0.00;
+      X-Runtime:
+      - '0.237391'
+      Date:
+      - Thu, 18 Dec 2014 15:13:43 GMT
+      X-Rack-Cache:
+      - miss
+      Connection:
+      - close
+    body:
+      encoding: UTF-8
+      string: '[{"id":154,"name":"Brandon Adams","sortable_name":"Adams, Brandon","short_name":"Brandon
+        Adams","sis_user_id":"student_4471","integration_id":null,"sis_login_id":"westudent1","sis_import_id":4,"login_id":"westudent1"},{"id":126,"name":"Barry
+        Blankenship","sortable_name":"Blankenship, Barry","short_name":"Barry Blankenship","sis_user_id":"student_4443","integration_id":null,"sis_login_id":"westudent38","sis_import_id":4,"login_id":"westudent38"},{"id":109,"name":"Rachel
+        Brown","sortable_name":"Brown, Rachel","short_name":"Rachel Brown","sis_user_id":"student_4426","integration_id":null,"sis_login_id":"westudent63","sis_import_id":4,"login_id":"westudent63"},{"id":130,"name":"Riley
+        Brown","sortable_name":"Brown, Riley","short_name":"Riley Brown","sis_user_id":"student_4447","integration_id":null,"sis_login_id":"westudent64","sis_import_id":4,"login_id":"westudent64"}]'
+    http_version: 
+  recorded_at: Thu, 18 Dec 2014 15:13:43 GMT
+recorded_with: VCR 2.9.3

data/spec/lib/pandarus/remote_collection_spec.rb

@@ -0,0 +1,57 @@
+require 'spec_helper'
+
+module Pandarus
+  describe RemoteCollection do
+    let(:footrest) {
+      Footrest::Client.new({
+        prefix: 'http://shard1.canvas.dev/api',
+        token: "Bearer 1~A5dY8IsOyhVOVRJi4V3XWGNsa7pzuIbdM8OCv62YTRFqOsiS9vX0NbtY8PR9q4pX",
+      })
+    }
+    let(:client) {
+      footrest.connection
+    }
+
+    let(:path) { '/v1/courses/14/users' }
+    let(:query_params) {
+      {
+        enrollment_type: 'student',
+      }
+    }
+    let(:collection) {
+      RemoteCollection.new(client, User, path, query_params)
+    }
+
+    describe '#first_page' do
+      let(:page) {
+        VCR.use_cassette('remote_collection_first_page') do
+          collection.first_page
+        end
+      }
+
+      before do
+        query_params[:per_page] = 4
+      end
+
+      it 'must use the supplied query params' do
+        expect(page.size).to eq 4
+      end
+
+      it 'must fetch the first page' do
+        expect(page.all?{|member| User === member}).to be_truthy
+      end
+    end
+
+    describe '#to_a' do
+      let(:array) {
+        VCR.use_cassette('remote_collection_all_pages') do
+          collection.to_a
+        end
+      }
+
+      it 'must fetch all pages and combine them into a single array' do
+        expect(array.size).to eq 21
+      end
+    end
+  end
+end

data/spec/model_base_spec.rb

@@ -1,23 +1,25 @@
 require_relative 'spec_helper'
 require 'pandarus'
 
-class TestModel < Pandarus::ModelBase
-  include Virtus.model
+describe Pandarus::ModelBase do
+  let(:klass) {
+    Class.new(Pandarus::ModelBase) do
+      include Virtus.model
 
-  attribute :id, resolve_type("Integer")
-  attribute :name, resolve_type("String")
-end
+      attribute :id, resolve_type("Integer")
+      attribute :name, resolve_type("String")
+    end
+  }
 
-describe Pandarus::ModelBase do
-  it "initializes" do
-    tm = TestModel.new(:id => 1, :name => "test")
-    tm.id.should == 1
-    tm.name.should == "test"
-  end
+  describe '#initialize' do
+    it "works" do
+      tm = klass.new(:id => 1, :name => "test")
+      expect(tm.id).to eq 1
+      expect(tm.name).to eq "test"
+    end
 
-  it "accepts attributes not in the map" do
-    lambda do
-      tm = TestModel.new(:id => 1, :integration_id => "blah")
-    end.should_not raise_error
+    it 'must not raise an exception when supplied attributes not in the attribute list' do
+      klass.new({foo: 'bar', id: 32})
+    end
   end
-end
+end