-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
6e0dce7
commit 111a2bc
Showing
3 changed files
with
18 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,7 +16,7 @@ | |
[{handler [:drafter/routes :draftset/api]} "test-system.edn"] | ||
(tc/assert-is-not-found-response | ||
(handler (help/create-share-with-permission-request | ||
test-editor "/v1/draftset/missing" :draft:view)))) | ||
test-editor "/v1/draftset/missing" :drafter:draft:view)))) | ||
|
||
(tc/deftest-system-with-keys share-draftset-with-permission-by-non-owner | ||
keys-for-test | ||
|
@@ -25,7 +25,7 @@ | |
(handler (help/create-share-with-permission-request | ||
test-publisher | ||
(help/create-draftset-through-api handler test-editor) | ||
:draft:view)))) | ||
:drafter:draft:view)))) | ||
|
||
(tc/deftest-system-with-keys share-draftset-with-user | ||
keys-for-test | ||
|
@@ -82,7 +82,7 @@ | |
(let [draftset-location (help/create-draftset-through-api handler test-editor) | ||
request (help/share-draftset-with-user-request | ||
draftset-location test-publisher test-editor) | ||
request (assoc-in request [:params :permission] "draft:view")] | ||
request (assoc-in request [:params :permission] "drafter:draft:view")] | ||
(tc/assert-is-unprocessable-response (handler request)))) | ||
|
||
(tc/deftest-system-with-keys share-draftset-with-permission | ||
|
@@ -93,30 +93,30 @@ | |
(help/create-share-with-permission-request | ||
test-editor | ||
(help/create-draftset-through-api handler test-editor) | ||
:draft:view))] | ||
:drafter:draft:view))] | ||
(tc/assert-is-ok-response share-response) | ||
(tc/assert-spec ::ds/Draftset body) | ||
;; Current owner doesn't change when sharing | ||
(is (= (user/username test-editor) (:current-owner body))) | ||
(is (= #{:draft:view} (:view-permissions body))))) | ||
(is (= #{:drafter:draft:view} (:view-permissions body))))) | ||
|
||
(tc/deftest-system-with-keys share-draftset-with-multiple-users-and-permissions | ||
keys-for-test | ||
[{handler [:drafter/routes :draftset/api]} "test-system.edn"] | ||
(let [draftset (help/create-draftset-through-api handler test-manager)] | ||
(tc/assert-is-ok-response | ||
(handler (help/create-share-with-permission-request | ||
test-manager draftset :draft:view))) | ||
test-manager draftset :drafter:draft:view))) | ||
(tc/assert-is-ok-response | ||
(handler (help/create-share-with-permission-request | ||
test-manager draftset :draft:view:special))) | ||
test-manager draftset :drafter:draft:view:special))) | ||
(tc/assert-is-ok-response | ||
(handler (help/share-draftset-with-user-request | ||
draftset test-publisher test-manager))) | ||
(let [res (handler (help/share-draftset-with-user-request | ||
draftset test-editor test-manager))] | ||
(tc/assert-is-ok-response res) | ||
(is (= #{:draft:view :draft:view:special} | ||
(is (= #{:drafter:draft:view :drafter:draft:view:special} | ||
(:view-permissions (:body res))) | ||
(is (= #{"[email protected]" "[email protected]"} | ||
(:view-users (:body res)))))))) | ||
|
@@ -145,7 +145,7 @@ | |
(let [draftset (help/create-draftset-through-api handler test-manager)] | ||
(tc/assert-is-ok-response | ||
(handler (help/create-share-with-permission-request | ||
test-manager draftset :draft:view))) | ||
test-manager draftset :drafter:draft:view))) | ||
(tc/assert-is-ok-response | ||
(handler (help/get-draftset-quads-request draftset test-editor :nq "true"))) | ||
(tc/assert-is-ok-response | ||
|
@@ -162,10 +162,10 @@ | |
(let [draftset (help/create-draftset-through-api handler test-manager)] | ||
(tc/assert-is-ok-response | ||
(handler (help/create-share-with-permission-request | ||
test-manager draftset :draft:view))) | ||
test-manager draftset :drafter:draft:view))) | ||
(tc/assert-is-ok-response | ||
(handler (help/create-share-with-permission-request | ||
test-manager draftset :draft:view:special))) | ||
test-manager draftset :drafter:draft:view:special))) | ||
(tc/assert-is-ok-response | ||
(handler (help/share-draftset-with-user-request | ||
draftset test-publisher test-manager))) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -209,14 +209,14 @@ | |
(t/is (nil? (sut/authenticate-request auth-methods request))))) | ||
|
||
(t/testing "Authentication succeeds" | ||
(let [user (user/create-authenticated-user "[email protected]" #{:draft:view}) | ||
(let [user (user/create-authenticated-user "[email protected]" #{:drafter:draft:view}) | ||
auth-methods [(succeeds-with-auth-method user)] | ||
request {:uri "/test" :request-method :get}] | ||
(t/is (= user (sut/authenticate-request auth-methods request))))) | ||
|
||
(t/testing "Authenticates with first matching handler" | ||
(let [user1 (user/create-authenticated-user "[email protected]" #{:draft:view}) | ||
user2 (user/create-authenticated-user "[email protected]" #{:draft:view}) | ||
(let [user1 (user/create-authenticated-user "[email protected]" #{:drafter:draft:view}) | ||
user2 (user/create-authenticated-user "[email protected]" #{:drafter:draft:view}) | ||
auth-methods [(succeeds-with-auth-method user1) | ||
(succeeds-with-auth-method user2)] | ||
request {:uri "/test" :request-method :get}] | ||
|
@@ -245,13 +245,13 @@ | |
(t/testing "Allows requests with existing identity" | ||
(let [auth-methods [always-fails-auth-method] | ||
handler (sut/wrap-authenticate identity auth-methods) | ||
user (user/create-authenticated-user "[email protected]" #{:draft:view}) | ||
user (user/create-authenticated-user "[email protected]" #{:drafter:draft:view}) | ||
request {:uri "/test" :request-method :get :identity user} | ||
response (handler request)] | ||
(t/is (= request response)))) | ||
|
||
(t/testing "Authenticates user" | ||
(let [user (user/create-authenticated-user "[email protected]" #{:draft:view}) | ||
(let [user (user/create-authenticated-user "[email protected]" #{:drafter:draft:view}) | ||
auth-methods [(succeeds-with-auth-method user)] | ||
handler (sut/wrap-authenticate identity auth-methods) | ||
request {:uri "/test" :request-method :get} | ||
|