spec/auth/effective_roles_spec.rb in ddr-models-3.0.0.alpha.4 vs spec/auth/effective_roles_spec.rb in ddr-models-3.0.0.beta.1

@@ -1,22 +1,22 @@
 module Ddr::Auth
   RSpec.describe EffectiveRoles do
     
     let(:resource) { FactoryGirl.build(:item) }
-    let(:policy) { Collection.new(pid: "coll-1") }
+    let(:policy) { Collection.new(id: "coll-1") }
     let(:agents) { [ "Editors", "[e-mail]", "public" ] }
-    let(:editor) { Roles::Role.build type: "Editor", agent: "Editors", scope: "policy" }
+    let(:editor) { Roles::Role.build role_type: "Editor", agent: "Editors", scope: "policy" }
     let(:downloader) { FactoryGirl.build(:role, :downloader, :public) }
     
     before do
       resource.admin_policy = policy
       resource.roles.grant downloader
       policy.roles.grant editor
     end
 
-    it "should return the list of roles granted to the agents on the resource in resource scope, plus the roles granted to the agents on the resource's policy in policy scope" do
-      expect(described_class.call(resource, agents).detach)
-        .to eq(Roles::DetachedRoleSet.new([downloader, editor]))
+    it "returns the list of roles granted to the agents on the resource in resource scope, plus the roles granted to the agents on the resource's policy in policy scope" do
+      expect(described_class.call(resource, agents))
+        .to eq(Roles::RoleSet.new(roles: [downloader, editor]))
     end
 
   end
 end