mailboxer 0.12.4 → 0.12.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (23) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +15 -3
  3. data/app/models/mailboxer/receipt.rb +4 -11
  4. data/gemfiles/rails4.2.gemfile +7 -0
  5. data/lib/generators/mailboxer/views_generator.rb +2 -2
  6. data/lib/mailboxer/mail_dispatcher.rb +2 -2
  7. data/lib/mailboxer/version.rb +1 -1
  8. data/mailboxer.gemspec +3 -1
  9. data/spec/dummy/config/application.rb +5 -0
  10. data/spec/integration/message_and_receipt_spec.rb +208 -208
  11. data/spec/integration/navigation_spec.rb +2 -3
  12. data/spec/mailboxer/mail_dispatcher_spec.rb +10 -10
  13. data/spec/mailboxer_spec.rb +1 -1
  14. data/spec/mailers/message_mailer_spec.rb +10 -10
  15. data/spec/mailers/notification_mailer_spec.rb +4 -5
  16. data/spec/models/conversation_spec.rb +27 -27
  17. data/spec/models/mailbox_spec.rb +56 -56
  18. data/spec/models/mailboxer_models_messageable_spec.rb +73 -73
  19. data/spec/models/message_spec.rb +10 -10
  20. data/spec/models/notification_spec.rb +60 -60
  21. data/spec/models/receipt_spec.rb +16 -17
  22. data/spec/spec_helper.rb +8 -0
  23. metadata +59 -30
data/spec/models/receipt_spec.rb CHANGED
@@ -1,44 +1,44 @@
1
1
  require 'spec_helper'
2
2
 
3
3
  describe Mailboxer::Receipt do
4
-
4
+
5
5
  before do
6
6
  @entity1 = FactoryGirl.create(:user)
7
7
  @entity2 = FactoryGirl.create(:user)
8
- @mail1 = @entity1.send_message(@entity2,"Body","Subject")
8
+ @mail1 = @entity1.send_message(@entity2,"Body","Subject")
9
9
  end
10
-
10
+
11
11
  it "should belong to a message" do
12
12
  assert @mail1.notification
13
13
  end
14
-
14
+
15
15
  it "should belong to a conversation" do
16
- assert @mail1.conversation
16
+ assert @mail1.conversation
17
17
  end
18
-
18
+
19
19
  it "should be able to be marked as unread" do
20
- @mail1.is_read.should==true
20
+ expect(@mail1.is_read).to be true
21
21
  @mail1.mark_as_unread
22
- @mail1.is_read.should==false
22
+ expect(@mail1.is_read).to be false
23
23
  end
24
-
24
+
25
25
  it "should be able to be marked as read" do
26
- @mail1.is_read.should==true
26
+ expect(@mail1.is_read).to be true
27
27
  @mail1.mark_as_unread
28
28
  @mail1.mark_as_read
29
- @mail1.is_read.should==true
29
+ expect(@mail1.is_read).to be true
30
30
  end
31
31
 
32
32
  it "should be able to be marked as deleted" do
33
- @mail1.deleted.should==false
33
+ expect(@mail1.deleted).to be false
34
34
  @mail1.mark_as_deleted
35
- @mail1.deleted.should==true
35
+ expect(@mail1.deleted).to be true
36
36
  end
37
37
 
38
38
  it "should be able to be marked as not deleted" do
39
39
  @mail1.deleted=true
40
40
  @mail1.mark_as_not_deleted
41
- @mail1.deleted.should==false
41
+ expect(@mail1.deleted).to be false
42
42
  end
43
43
 
44
44
  context "STI models" do
@@ -47,10 +47,9 @@ describe Mailboxer::Receipt do
47
47
  @entity4 = FactoryGirl.create(:user)
48
48
  @mail2 = @entity3.send_message(@entity4, "Body", "Subject")
49
49
  end
50
-
50
+
51
51
  it "should refer to the correct base class" do
52
- @mail2.receiver_type.should == @entity3.class.base_class.to_s
52
+ expect(@mail2.receiver_type).to eq @entity3.class.base_class.to_s
53
53
  end
54
54
  end
55
-
56
55
  end
data/spec/spec_helper.rb CHANGED
@@ -4,6 +4,9 @@ ENV["RAILS_ENV"] = "test"
4
4
  require File.expand_path("../dummy/config/environment.rb", __FILE__)
5
5
  require "rspec/rails"
6
6
 
7
+ require 'rspec/its'
8
+ require 'rspec/collection_matchers'
9
+
7
10
  ActionMailer::Base.delivery_method = :test
8
11
  ActionMailer::Base.perform_deliveries = true
9
12
  ActionMailer::Base.default_url_options[:host] = "test.com"
@@ -36,4 +39,9 @@ RSpec.configure do |config|
36
39
 
37
40
  # == Mock Framework
38
41
  config.mock_with :rspec
42
+
43
+ # Rspec only clears out ActionMailer::Base#deliveries for mailers specs
44
+ config.after(:each, type: :integration){ ActionMailer::Base.deliveries.clear }
45
+
46
+ config.infer_spec_type_from_file_location!
39
47
  end
metadata CHANGED
@@ -1,153 +1,181 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: mailboxer
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.12.4
4
+ version: 0.12.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Eduardo Casanova Cuesta
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-09-08 00:00:00.000000000 Z
11
+ date: 2015-01-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: foreigner
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - '>='
17
+ - - ">="
18
18
  - !ruby/object:Gem::Version
19
19
  version: 0.9.1
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
26
  version: 0.9.1
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: rails
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - '>='
31
+ - - ">="
32
32
  - !ruby/object:Gem::Version
33
33
  version: 3.2.0
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - '>='
38
+ - - ">="
39
39
  - !ruby/object:Gem::Version
40
40
  version: 3.2.0
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: carrierwave
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - '>='
45
+ - - ">="
46
46
  - !ruby/object:Gem::Version
47
47
  version: 0.5.8
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - '>='
52
+ - - ">="
53
53
  - !ruby/object:Gem::Version
54
54
  version: 0.5.8
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: rspec-rails
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - ~>
59
+ - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: '2.99'
61
+ version: '3.0'
62
62
  type: :development
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - ~>
66
+ - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: '2.99'
68
+ version: '3.0'
69
+ - !ruby/object:Gem::Dependency
70
+ name: rspec-its
71
+ requirement: !ruby/object:Gem::Requirement
72
+ requirements:
73
+ - - "~>"
74
+ - !ruby/object:Gem::Version
75
+ version: '1.1'
76
+ type: :development
77
+ prerelease: false
78
+ version_requirements: !ruby/object:Gem::Requirement
79
+ requirements:
80
+ - - "~>"
81
+ - !ruby/object:Gem::Version
82
+ version: '1.1'
83
+ - !ruby/object:Gem::Dependency
84
+ name: rspec-collection_matchers
85
+ requirement: !ruby/object:Gem::Requirement
86
+ requirements:
87
+ - - "~>"
88
+ - !ruby/object:Gem::Version
89
+ version: '1.1'
90
+ type: :development
91
+ prerelease: false
92
+ version_requirements: !ruby/object:Gem::Requirement
93
+ requirements:
94
+ - - "~>"
95
+ - !ruby/object:Gem::Version
96
+ version: '1.1'
69
97
  - !ruby/object:Gem::Dependency
70
98
  name: appraisal
71
99
  requirement: !ruby/object:Gem::Requirement
72
100
  requirements:
73
- - - ~>
101
+ - - "~>"
74
102
  - !ruby/object:Gem::Version
75
103
  version: 1.0.0
76
104
  type: :development
77
105
  prerelease: false
78
106
  version_requirements: !ruby/object:Gem::Requirement
79
107
  requirements:
80
- - - ~>
108
+ - - "~>"
81
109
  - !ruby/object:Gem::Version
82
110
  version: 1.0.0
83
111
  - !ruby/object:Gem::Dependency
84
112
  name: shoulda-matchers
85
113
  requirement: !ruby/object:Gem::Requirement
86
114
  requirements:
87
- - - '>='
115
+ - - ">="
88
116
  - !ruby/object:Gem::Version
89
117
  version: '0'
90
118
  type: :development
91
119
  prerelease: false
92
120
  version_requirements: !ruby/object:Gem::Requirement
93
121
  requirements:
94
- - - '>='
122
+ - - ">="
95
123
  - !ruby/object:Gem::Version
96
124
  version: '0'
97
125
  - !ruby/object:Gem::Dependency
98
126
  name: factory_girl
99
127
  requirement: !ruby/object:Gem::Requirement
100
128
  requirements:
101
- - - ~>
129
+ - - "~>"
102
130
  - !ruby/object:Gem::Version
103
131
  version: 2.6.0
104
132
  type: :development
105
133
  prerelease: false
106
134
  version_requirements: !ruby/object:Gem::Requirement
107
135
  requirements:
108
- - - ~>
136
+ - - "~>"
109
137
  - !ruby/object:Gem::Version
110
138
  version: 2.6.0
111
139
  - !ruby/object:Gem::Dependency
112
140
  name: forgery
113
141
  requirement: !ruby/object:Gem::Requirement
114
142
  requirements:
115
- - - '>='
143
+ - - ">="
116
144
  - !ruby/object:Gem::Version
117
145
  version: 0.3.6
118
146
  type: :development
119
147
  prerelease: false
120
148
  version_requirements: !ruby/object:Gem::Requirement
121
149
  requirements:
122
- - - '>='
150
+ - - ">="
123
151
  - !ruby/object:Gem::Version
124
152
  version: 0.3.6
125
153
  - !ruby/object:Gem::Dependency
126
154
  name: capybara
127
155
  requirement: !ruby/object:Gem::Requirement
128
156
  requirements:
129
- - - '>='
157
+ - - ">="
130
158
  - !ruby/object:Gem::Version
131
159
  version: 0.3.9
132
160
  type: :development
133
161
  prerelease: false
134
162
  version_requirements: !ruby/object:Gem::Requirement
135
163
  requirements:
136
- - - '>='
164
+ - - ">="
137
165
  - !ruby/object:Gem::Version
138
166
  version: 0.3.9
139
167
  - !ruby/object:Gem::Dependency
140
168
  name: sqlite3
141
169
  requirement: !ruby/object:Gem::Requirement
142
170
  requirements:
143
- - - '>='
171
+ - - ">="
144
172
  - !ruby/object:Gem::Version
145
173
  version: '0'
146
174
  type: :development
147
175
  prerelease: false
148
176
  version_requirements: !ruby/object:Gem::Requirement
149
177
  requirements:
150
- - - '>='
178
+ - - ">="
151
179
  - !ruby/object:Gem::Version
152
180
  version: '0'
153
181
  description: A Rails engine that allows any model to act as messageable, adding the
@@ -161,10 +189,10 @@ executables: []
161
189
  extensions: []
162
190
  extra_rdoc_files: []
163
191
  files:
164
- - .gitignore
165
- - .rspec
166
- - .travis.yml
167
- - .yardopts
192
+ - ".gitignore"
193
+ - ".rspec"
194
+ - ".travis.yml"
195
+ - ".yardopts"
168
196
  - Appraisals
169
197
  - Gemfile
170
198
  - LICENSE.txt
@@ -198,6 +226,7 @@ files:
198
226
  - gemfiles/rails3.2.gemfile
199
227
  - gemfiles/rails4.0.gemfile
200
228
  - gemfiles/rails4.1.gemfile
229
+ - gemfiles/rails4.2.gemfile
201
230
  - lib/generators/mailboxer/install_generator.rb
202
231
  - lib/generators/mailboxer/namespacing_compatibility_generator.rb
203
232
  - lib/generators/mailboxer/templates/initializer.rb
@@ -281,12 +310,12 @@ require_paths:
281
310
  - lib
282
311
  required_ruby_version: !ruby/object:Gem::Requirement
283
312
  requirements:
284
- - - '>='
313
+ - - ">="
285
314
  - !ruby/object:Gem::Version
286
315
  version: '0'
287
316
  required_rubygems_version: !ruby/object:Gem::Requirement
288
317
  requirements:
289
- - - '>='
318
+ - - ">="
290
319
  - !ruby/object:Gem::Version
291
320
  version: '0'
292
321
  requirements: []