bearcat 1.2.4 → 1.2.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/bearcat/client/users.rb +4 -0
- data/lib/bearcat/version.rb +1 -1
- data/spec/bearcat/client/users_spec.rb +6 -0
- data/spec/fixtures/merge_user.json +8 -0
- metadata +6 -5
- data/spec/fixtures/account_groups.json +0 -42
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 8d1c10697f9c2a2710a231e2d7faa7f4517cddcc
|
|
4
|
+
data.tar.gz: a99835d4a11d0959b4cc38d56755bb9b2a595fd2
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: c37b3631a8f2b4818e9c6517f58943c6984da05a5044802d2b8673e827dee2ba20cb4a52ab5088dff8d46ddfcedc815b2c4bde7b6634e528b0f00b0e414ea357
|
|
7
|
+
data.tar.gz: f63bdb3a8d37f766a90697f35aeefd00e3ab7aa92cf0ecdb374c54a5ab2a0b028f00fc66b7b0f52bb07ae1447f917bc692706660f8839bbc988d2b3a31b56354
|
data/lib/bearcat/client/users.rb
CHANGED
data/lib/bearcat/version.rb
CHANGED
|
@@ -115,6 +115,12 @@ describe Bearcat::Client::Users do
|
|
|
115
115
|
custom_food_data["data"]["food"]["least_favorite"].should == "water mellon"
|
|
116
116
|
end
|
|
117
117
|
|
|
118
|
+
it "merges user info" do
|
|
119
|
+
body = {}
|
|
120
|
+
stub_put(@client, "/api/v1/users/1/merge_into/2").with(body: body).to_return(json_response('merge_user.json'))
|
|
121
|
+
user = @client.user_merge(1,2)
|
|
122
|
+
end
|
|
123
|
+
|
|
118
124
|
end
|
|
119
125
|
|
|
120
126
|
context 'DELETE' do
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: bearcat
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.2.
|
|
4
|
+
version: 1.2.5
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Nathan Mills, Jake Sorce
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2016-
|
|
11
|
+
date: 2016-05-19 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rake
|
|
@@ -169,7 +169,6 @@ files:
|
|
|
169
169
|
- spec/fixtures/access_token.json
|
|
170
170
|
- spec/fixtures/account_admins.json
|
|
171
171
|
- spec/fixtures/account_courses.json
|
|
172
|
-
- spec/fixtures/account_groups.json
|
|
173
172
|
- spec/fixtures/account_reports.json
|
|
174
173
|
- spec/fixtures/account_reports_index.json
|
|
175
174
|
- spec/fixtures/account_reports_result_success.json
|
|
@@ -222,6 +221,7 @@ files:
|
|
|
222
221
|
- spec/fixtures/group_categories.json
|
|
223
222
|
- spec/fixtures/group_conferences.json
|
|
224
223
|
- spec/fixtures/link_unlink_outcome.json
|
|
224
|
+
- spec/fixtures/merge_user.json
|
|
225
225
|
- spec/fixtures/module_item_sequence.json
|
|
226
226
|
- spec/fixtures/module_items.json
|
|
227
227
|
- spec/fixtures/modules.json
|
|
@@ -276,7 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
276
276
|
version: '0'
|
|
277
277
|
requirements: []
|
|
278
278
|
rubyforge_project:
|
|
279
|
-
rubygems_version: 2.4.
|
|
279
|
+
rubygems_version: 2.4.5.1
|
|
280
280
|
signing_key:
|
|
281
281
|
specification_version: 4
|
|
282
282
|
summary: Canvas API
|
|
@@ -313,7 +313,6 @@ test_files:
|
|
|
313
313
|
- spec/fixtures/access_token.json
|
|
314
314
|
- spec/fixtures/account_admins.json
|
|
315
315
|
- spec/fixtures/account_courses.json
|
|
316
|
-
- spec/fixtures/account_groups.json
|
|
317
316
|
- spec/fixtures/account_reports.json
|
|
318
317
|
- spec/fixtures/account_reports_index.json
|
|
319
318
|
- spec/fixtures/account_reports_result_success.json
|
|
@@ -366,6 +365,7 @@ test_files:
|
|
|
366
365
|
- spec/fixtures/group_categories.json
|
|
367
366
|
- spec/fixtures/group_conferences.json
|
|
368
367
|
- spec/fixtures/link_unlink_outcome.json
|
|
368
|
+
- spec/fixtures/merge_user.json
|
|
369
369
|
- spec/fixtures/module_item_sequence.json
|
|
370
370
|
- spec/fixtures/module_items.json
|
|
371
371
|
- spec/fixtures/modules.json
|
|
@@ -401,3 +401,4 @@ test_files:
|
|
|
401
401
|
- spec/fixtures/user_page_views.json
|
|
402
402
|
- spec/fixtures/user_profile.json
|
|
403
403
|
- spec/helper.rb
|
|
404
|
+
has_rdoc:
|
|
@@ -1,42 +0,0 @@
|
|
|
1
|
-
[
|
|
2
|
-
{
|
|
3
|
-
"id":2,
|
|
4
|
-
"name":"2010",
|
|
5
|
-
"max_membership":null,
|
|
6
|
-
"is_public":false,
|
|
7
|
-
"join_level":"invitation_only",
|
|
8
|
-
"group_category_id":2,
|
|
9
|
-
"description":null,
|
|
10
|
-
"members_count":0,
|
|
11
|
-
"storage_quota_mb":50,
|
|
12
|
-
"context_type":"Account",
|
|
13
|
-
"account_id":1,
|
|
14
|
-
"avatar_url":null,
|
|
15
|
-
"role":null,
|
|
16
|
-
"leader":null,
|
|
17
|
-
"sis_group_id":null,
|
|
18
|
-
"sis_import_id":null,
|
|
19
|
-
"has_submission":false,
|
|
20
|
-
"concluded":false
|
|
21
|
-
},
|
|
22
|
-
{
|
|
23
|
-
"id":3,
|
|
24
|
-
"name":"2014",
|
|
25
|
-
"max_membership":null,
|
|
26
|
-
"is_public":false,
|
|
27
|
-
"join_level":"invitation_only",
|
|
28
|
-
"group_category_id":3,
|
|
29
|
-
"description":null,
|
|
30
|
-
"members_count":2,
|
|
31
|
-
"storage_quota_mb":50,
|
|
32
|
-
"context_type":"Account",
|
|
33
|
-
"account_id":1,
|
|
34
|
-
"avatar_url":null,
|
|
35
|
-
"role":null,
|
|
36
|
-
"leader":null,
|
|
37
|
-
"sis_group_id":null,
|
|
38
|
-
"sis_import_id":null,
|
|
39
|
-
"has_submission":false,
|
|
40
|
-
"concluded":false
|
|
41
|
-
}
|
|
42
|
-
]
|