enju_bookmark 0.3.0.beta.1 → 0.3.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/enju_bookmark/version.rb +1 -1
- data/spec/controllers/bookmarks_controller_spec.rb +15 -15
- data/spec/controllers/manifestations_controller_spec.rb +4 -4
- data/spec/factories/bookmark_stat.rb +2 -2
- data/spec/factories/profile.rb +2 -2
- data/spec/factories/user.rb +13 -13
- metadata +9 -9
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: ed02ca735d86e5b28bc8c59c4b6984b16060a8b0
|
4
|
+
data.tar.gz: 5184e33b70fdee1644a6b0de39f981d7f1ba27e4
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: eecf285ef7a15967ab475a097a75f9ba07ed7a46768217e3667a9debd551b7d547c614adfa788d1e5a6ab9cbbbc70acd645e336e4393b7d2c8b9ea95ab71893d
|
7
|
+
data.tar.gz: be46f5c99096354fab6123b47db8e0da747b96abfe6208b01e0469eee159ec739838aada695474a7effd4aa99612a9b56c83859ad9b3c8d6df54f0665ba6c596
|
@@ -36,7 +36,7 @@ describe BookmarksController do
|
|
36
36
|
|
37
37
|
it "should get my bookmark index" do
|
38
38
|
get :index
|
39
|
-
expect(response).to
|
39
|
+
expect(response).to be_successful
|
40
40
|
expect(assigns(:bookmarks)).to eq users(:user1).bookmarks.page(1)
|
41
41
|
end
|
42
42
|
|
@@ -48,7 +48,7 @@ describe BookmarksController do
|
|
48
48
|
|
49
49
|
it "should get other user's public bookmark index" do
|
50
50
|
get :index, params: { user_id: users(:admin).username }
|
51
|
-
expect(response).to
|
51
|
+
expect(response).to be_successful
|
52
52
|
expect(assigns(:bookmarks)).to eq users(:admin).bookmarks.page(1)
|
53
53
|
end
|
54
54
|
|
@@ -94,7 +94,7 @@ describe BookmarksController do
|
|
94
94
|
|
95
95
|
it "should shot other user's bookmark" do
|
96
96
|
get :show, params: { id: 3 }
|
97
|
-
expect(response).to
|
97
|
+
expect(response).to be_successful
|
98
98
|
end
|
99
99
|
end
|
100
100
|
|
@@ -114,7 +114,7 @@ describe BookmarksController do
|
|
114
114
|
|
115
115
|
it "should show my bookmark" do
|
116
116
|
get :show, params: { id: 3 }
|
117
|
-
expect(response).to
|
117
|
+
expect(response).to be_successful
|
118
118
|
end
|
119
119
|
end
|
120
120
|
|
@@ -135,7 +135,7 @@ describe BookmarksController do
|
|
135
135
|
it "assigns the requested bookmark as @bookmark" do
|
136
136
|
get :new, params: { bookmark: { title: 'test' } }
|
137
137
|
expect(assigns(:bookmark)).not_to be_valid
|
138
|
-
expect(response).to
|
138
|
+
expect(response).to be_successful
|
139
139
|
end
|
140
140
|
end
|
141
141
|
|
@@ -145,7 +145,7 @@ describe BookmarksController do
|
|
145
145
|
it "assigns the requested bookmark as @bookmark" do
|
146
146
|
get :new, params: { bookmark: { title: 'test' } }
|
147
147
|
expect(assigns(:bookmark)).not_to be_valid
|
148
|
-
expect(response).to
|
148
|
+
expect(response).to be_successful
|
149
149
|
end
|
150
150
|
end
|
151
151
|
|
@@ -155,22 +155,22 @@ describe BookmarksController do
|
|
155
155
|
it "should get my new template without url" do
|
156
156
|
get :new, params: { bookmark: { title: 'test' } }
|
157
157
|
expect(assigns(:bookmark)).not_to be_valid
|
158
|
-
expect(response).to
|
158
|
+
expect(response).to be_successful
|
159
159
|
end
|
160
160
|
|
161
161
|
it "should not get new template with url already bookmarked" do
|
162
162
|
get :new, params: { bookmark: {url: 'http://www.slis.keio.ac.jp/'} }
|
163
|
-
expect(response).to
|
163
|
+
expect(response).to be_successful
|
164
164
|
end
|
165
165
|
|
166
166
|
it "should get my new template with external url" do
|
167
167
|
get :new, params: { bookmark: {title: 'example', url: 'http://example.com'} }
|
168
|
-
expect(response).to
|
168
|
+
expect(response).to be_successful
|
169
169
|
end
|
170
170
|
|
171
171
|
it "should get my new template with internal url" do
|
172
172
|
get :new, params: { bookmark: {url: "#{LibraryGroup.site_config.url}/manifestations/1"} }
|
173
|
-
expect(response).to
|
173
|
+
expect(response).to be_successful
|
174
174
|
end
|
175
175
|
end
|
176
176
|
end
|
@@ -182,7 +182,7 @@ describe BookmarksController do
|
|
182
182
|
it "assigns the requested bookmark as @bookmark" do
|
183
183
|
get :edit, params: { id: 3 }
|
184
184
|
expect(assigns(:bookmark)).to eq(Bookmark.find(3))
|
185
|
-
expect(response).to
|
185
|
+
expect(response).to be_successful
|
186
186
|
end
|
187
187
|
end
|
188
188
|
|
@@ -192,7 +192,7 @@ describe BookmarksController do
|
|
192
192
|
it "assigns the requested bookmark as @bookmark" do
|
193
193
|
get :edit, params: { id: 3 }
|
194
194
|
expect(assigns(:bookmark)).to eq(Bookmark.find(3))
|
195
|
-
expect(response).to
|
195
|
+
expect(response).to be_successful
|
196
196
|
end
|
197
197
|
end
|
198
198
|
|
@@ -207,7 +207,7 @@ describe BookmarksController do
|
|
207
207
|
it "should edit my bookmark" do
|
208
208
|
get :edit, params: { id: 3 }
|
209
209
|
expect(assigns(:bookmark)).to eq(Bookmark.find(3))
|
210
|
-
expect(response).to
|
210
|
+
expect(response).to be_successful
|
211
211
|
end
|
212
212
|
end
|
213
213
|
|
@@ -264,13 +264,13 @@ describe BookmarksController do
|
|
264
264
|
it "should not create bookmark without url" do
|
265
265
|
post :create, params: { bookmark: {title: 'test'} }
|
266
266
|
expect(assigns(:bookmark)).not_to be_valid
|
267
|
-
expect(response).to
|
267
|
+
expect(response).to be_successful
|
268
268
|
end
|
269
269
|
|
270
270
|
it "should not create bookmark already bookmarked" do
|
271
271
|
post :create, params: { bookmark: {user_id: users(:user1).id, url: 'http://www.slis.keio.ac.jp/'} }
|
272
272
|
expect(assigns(:bookmark)).not_to be_valid
|
273
|
-
expect(response).to
|
273
|
+
expect(response).to be_successful
|
274
274
|
end
|
275
275
|
|
276
276
|
it "should not create other user's bookmark" do
|
@@ -15,7 +15,7 @@ describe ManifestationsController do
|
|
15
15
|
describe 'When not logged in' do
|
16
16
|
it 'should get tag_cloud' do
|
17
17
|
get :index, params: { query: '2005', view: 'tag_cloud' }
|
18
|
-
expect(response).to
|
18
|
+
expect(response).to be_successful
|
19
19
|
expect(response).to render_template('manifestations/_tag_cloud')
|
20
20
|
end
|
21
21
|
end
|
@@ -24,13 +24,13 @@ describe ManifestationsController do
|
|
24
24
|
it 'should show manifestation with tag_edit' do
|
25
25
|
get :show, params: { id: 1, mode: 'tag_edit' }
|
26
26
|
expect(response).to render_template('manifestations/_tag_edit')
|
27
|
-
expect(response).to
|
27
|
+
expect(response).to be_successful
|
28
28
|
end
|
29
29
|
|
30
30
|
it 'should show manifestation with tag_list' do
|
31
31
|
get :show, params: { id: 1, mode: 'tag_list' }
|
32
32
|
expect(response).to render_template('manifestations/_tag_list')
|
33
|
-
expect(response).to
|
33
|
+
expect(response).to be_successful
|
34
34
|
end
|
35
35
|
end
|
36
36
|
end
|
@@ -41,7 +41,7 @@ describe ManifestationsController do
|
|
41
41
|
|
42
42
|
it 'should edit manifestation with tag_edit' do
|
43
43
|
get :edit, params: { id: 1, mode: 'tag_edit' }
|
44
|
-
expect(response).to
|
44
|
+
expect(response).to be_successful
|
45
45
|
end
|
46
46
|
end
|
47
47
|
end
|
data/spec/factories/profile.rb
CHANGED
@@ -3,8 +3,8 @@ FactoryBot.define do
|
|
3
3
|
f.user_group_id {UserGroup.first.id}
|
4
4
|
f.required_role_id {Role.where(name: 'User').first.id}
|
5
5
|
f.sequence(:user_number){|n| "user_number_#{n}"}
|
6
|
-
f.library_id 2
|
7
|
-
f.locale
|
6
|
+
f.library_id { 2 }
|
7
|
+
f.locale { 'ja' }
|
8
8
|
f.user_id {FactoryBot.create(:user).id}
|
9
9
|
end
|
10
10
|
end
|
data/spec/factories/user.rb
CHANGED
@@ -1,43 +1,43 @@
|
|
1
1
|
FactoryBot.define do
|
2
|
-
factory :admin, :
|
2
|
+
factory :admin, class: User do |f|
|
3
3
|
f.sequence(:username){|n| "admin_#{n}"}
|
4
4
|
f.sequence(:email){|n| "admin_#{n}@example.jp"}
|
5
|
-
f.password 'adminpassword'
|
6
|
-
f.password_confirmation 'adminpassword'
|
5
|
+
f.password { 'adminpassword' }
|
6
|
+
f.password_confirmation { 'adminpassword' }
|
7
7
|
f.after(:create) do |user|
|
8
8
|
user_has_role = UserHasRole.new
|
9
|
-
user_has_role.assign_attributes({:
|
9
|
+
user_has_role.assign_attributes({user_id: user.id, role_id: Role.find_by(name: 'Administrator').id})
|
10
10
|
user_has_role.save
|
11
11
|
user.reload
|
12
12
|
end
|
13
13
|
end
|
14
14
|
|
15
|
-
factory :librarian, :
|
15
|
+
factory :librarian, class: User do |f|
|
16
16
|
f.sequence(:username){|n| "librarian_#{n}"}
|
17
17
|
f.sequence(:email){|n| "librarian_#{n}@example.jp"}
|
18
|
-
f.password 'librarianpassword'
|
19
|
-
f.password_confirmation 'librarianpassword'
|
18
|
+
f.password { 'librarianpassword' }
|
19
|
+
f.password_confirmation { 'librarianpassword' }
|
20
20
|
f.after(:create) do |user|
|
21
21
|
user_has_role = UserHasRole.new
|
22
|
-
user_has_role.assign_attributes({:
|
22
|
+
user_has_role.assign_attributes({user_id: user.id, role_id: Role.find_by(name: 'Librarian').id})
|
23
23
|
user_has_role.save
|
24
24
|
user.reload
|
25
25
|
end
|
26
26
|
end
|
27
27
|
|
28
|
-
factory :user, :
|
28
|
+
factory :user, class: User do |f|
|
29
29
|
f.sequence(:username){|n| "user_#{n}"}
|
30
30
|
f.sequence(:email){|n| "user_#{n}@example.jp"}
|
31
|
-
f.password 'userpassword'
|
32
|
-
f.password_confirmation 'userpassword'
|
31
|
+
f.password { 'userpassword' }
|
32
|
+
f.password_confirmation { 'userpassword' }
|
33
33
|
f.after(:create) do |user|
|
34
34
|
user_has_role = UserHasRole.new
|
35
|
-
user_has_role.assign_attributes({:
|
35
|
+
user_has_role.assign_attributes({user_id: user.id, role_id: Role.find_by(name: 'User').id})
|
36
36
|
user_has_role.save
|
37
37
|
user.reload
|
38
38
|
end
|
39
39
|
end
|
40
40
|
|
41
|
-
factory :invalid_user, :
|
41
|
+
factory :invalid_user, class: User do |f|
|
42
42
|
end
|
43
43
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: enju_bookmark
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.3.0
|
4
|
+
version: 0.3.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Kosuke Tanabe
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2018-
|
11
|
+
date: 2018-10-30 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: enju_biblio
|
@@ -16,14 +16,14 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - "~>"
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 0.3.0
|
19
|
+
version: 0.3.0
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - "~>"
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: 0.3.0
|
26
|
+
version: 0.3.0
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: acts-as-taggable-on
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
@@ -44,14 +44,14 @@ dependencies:
|
|
44
44
|
requirements:
|
45
45
|
- - "~>"
|
46
46
|
- !ruby/object:Gem::Version
|
47
|
-
version: 1.3.0
|
47
|
+
version: 1.3.0
|
48
48
|
type: :development
|
49
49
|
prerelease: false
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
51
51
|
requirements:
|
52
52
|
- - "~>"
|
53
53
|
- !ruby/object:Gem::Version
|
54
|
-
version: 1.3.0
|
54
|
+
version: 1.3.0
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
56
|
name: sqlite3
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
@@ -571,12 +571,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
571
571
|
version: '0'
|
572
572
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
573
573
|
requirements:
|
574
|
-
- - "
|
574
|
+
- - ">="
|
575
575
|
- !ruby/object:Gem::Version
|
576
|
-
version:
|
576
|
+
version: '0'
|
577
577
|
requirements: []
|
578
578
|
rubyforge_project:
|
579
|
-
rubygems_version: 2.6.14.
|
579
|
+
rubygems_version: 2.6.14.3
|
580
580
|
signing_key:
|
581
581
|
specification_version: 4
|
582
582
|
summary: enju_bookmark plugin
|