enju_message 0.1.16 → 0.2.0.beta.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.rdoc +3 -3
- data/app/controllers/message_requests_controller.rb +13 -3
- data/app/controllers/message_templates_controller.rb +12 -1
- data/app/controllers/messages_controller.rb +17 -6
- data/app/models/concerns/enju_message/enju_user.rb +21 -0
- data/app/models/message.rb +1 -1
- data/app/models/message_template.rb +0 -1
- data/app/policies/message_policy.rb +37 -0
- data/app/policies/message_request_policy.rb +21 -0
- data/app/policies/message_template_policy.rb +21 -0
- data/app/views/message_requests/show.html.erb +1 -1
- data/app/views/message_templates/index.html.erb +4 -4
- data/app/views/message_templates/show.html.erb +2 -2
- data/app/views/messages/index.html.erb +2 -2
- data/app/views/messages/show.html.erb +2 -2
- data/db/migrate/20160703185015_add_most_recent_to_message_transitions.rb +9 -0
- data/lib/enju_message/engine.rb +0 -1
- data/lib/enju_message/version.rb +1 -1
- data/lib/enju_message.rb +0 -3
- data/lib/generators/enju_message/setup/setup_generator.rb +3 -2
- data/lib/tasks/enju_message_tasks.rake +1 -1
- data/spec/controllers/message_requests_controller_spec.rb +2 -2
- data/spec/controllers/message_templates_controller_spec.rb +14 -14
- data/spec/controllers/messages_controller_spec.rb +57 -33
- data/spec/dummy/app/controllers/application_controller.rb +6 -2
- data/spec/dummy/app/models/user.rb +2 -2
- data/spec/dummy/config/application.rb +6 -24
- data/spec/dummy/config/environments/development.rb +25 -14
- data/spec/dummy/config/environments/production.rb +50 -31
- data/spec/dummy/config/environments/test.rb +21 -18
- data/spec/dummy/db/migrate/20140821151023_create_colors.rb +14 -0
- data/spec/dummy/db/migrate/20150924115059_create_withdraws.rb +13 -0
- data/spec/dummy/db/migrate/20151213070943_add_translation_table_to_library_group.rb +13 -0
- data/spec/dummy/db/migrate/20151213072705_add_footer_banner_to_library_group.rb +9 -0
- data/spec/dummy/db/schema.rb +37 -2
- data/spec/support/devise.rb +2 -2
- metadata +83 -34
- data/app/models/enju_message/ability.rb +0 -33
- data/lib/enju_message/user.rb +0 -28
- data/spec/dummy/config/application.yml +0 -38
- data/spec/dummy/config/initializers/resque_mailer.rb +0 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 70bfb609fae09c6b2e84bdb4205af0bdc310c9cd
|
4
|
+
data.tar.gz: c3cbe54bcb38ec0ad1e3bddaeed46b122ba443c8
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a6b2d1eb07db5f5d7a031a6c715e6e0f280740864dd2de00df55d179c69be77785942466075c19cc0a4a5633834c2296a2ce41f282b641e971453c6db916ba7d
|
7
|
+
data.tar.gz: f28a2b8f22cc4e78e739267192110ee075952fdb8e366f9c005056b88ea996c51df848cf151f0002a0907f793ec0d488547493c69b567c520f75d03698d1774c
|
data/README.rdoc
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
= EnjuMessage
|
2
|
-
{<img src="https://travis-ci.org/next-l/enju_message.svg?branch=1.
|
3
|
-
{<img src="https://coveralls.io/repos/next-l/enju_message/badge.svg?branch=1.
|
4
|
-
{<img src="https://hakiri.io/github/next-l/enju_message/1.
|
2
|
+
{<img src="https://travis-ci.org/next-l/enju_message.svg?branch=1.2" alt="Build Status" />}[https://travis-ci.org/next-l/enju_message]
|
3
|
+
{<img src="https://coveralls.io/repos/next-l/enju_message/badge.svg?branch=1.2&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_message?branch=1.2]
|
4
|
+
{<img src="https://hakiri.io/github/next-l/enju_message/1.2.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_message/1.2]
|
5
5
|
|
6
6
|
This project rocks and uses MIT-LICENSE.
|
7
7
|
|
@@ -1,5 +1,6 @@
|
|
1
1
|
class MessageRequestsController < ApplicationController
|
2
|
-
|
2
|
+
before_action :set_message_request, only: [:show, :edit, :update, :destroy]
|
3
|
+
before_action :check_policy, only: [:index, :new, :create]
|
3
4
|
|
4
5
|
# GET /message_requests
|
5
6
|
# GET /message_requests.json
|
@@ -30,7 +31,7 @@ class MessageRequestsController < ApplicationController
|
|
30
31
|
|
31
32
|
# GET /message_requests/1/edit
|
32
33
|
def edit
|
33
|
-
@message_requests = MessageTemplate.
|
34
|
+
@message_requests = MessageTemplate.order(:position)
|
34
35
|
end
|
35
36
|
|
36
37
|
# PUT /message_requests/1
|
@@ -42,7 +43,7 @@ class MessageRequestsController < ApplicationController
|
|
42
43
|
format.html { redirect_to(@message_request) }
|
43
44
|
format.json { head :no_content }
|
44
45
|
else
|
45
|
-
@message_requests = MessageTemplate.
|
46
|
+
@message_requests = MessageTemplate.order(:position)
|
46
47
|
format.html { render action: "edit" }
|
47
48
|
format.json { render json: @message_request.errors, status: :unprocessable_entity }
|
48
49
|
end
|
@@ -61,6 +62,15 @@ class MessageRequestsController < ApplicationController
|
|
61
62
|
end
|
62
63
|
|
63
64
|
private
|
65
|
+
def set_message_request
|
66
|
+
@message_request = MessageRequest.find(params[:id])
|
67
|
+
authorize @message_request
|
68
|
+
end
|
69
|
+
|
70
|
+
def check_policy
|
71
|
+
authorize MessageRequest
|
72
|
+
end
|
73
|
+
|
64
74
|
def message_request_params
|
65
75
|
params.require(:message_request).permit(
|
66
76
|
:body,
|
@@ -1,5 +1,7 @@
|
|
1
1
|
class MessageTemplatesController < ApplicationController
|
2
|
-
|
2
|
+
before_action :set_message_template, only: [:show, :edit, :update, :destroy]
|
3
|
+
before_action :check_policy, only: [:index, :new, :create]
|
4
|
+
|
3
5
|
# GET /message_templates
|
4
6
|
# GET /message_templates.json
|
5
7
|
def index
|
@@ -82,6 +84,15 @@ class MessageTemplatesController < ApplicationController
|
|
82
84
|
end
|
83
85
|
|
84
86
|
private
|
87
|
+
def set_message_template
|
88
|
+
@message_template = MessageTemplate.find(params[:id])
|
89
|
+
authorize @message_template
|
90
|
+
end
|
91
|
+
|
92
|
+
def check_policy
|
93
|
+
authorize MessageTemplate
|
94
|
+
end
|
95
|
+
|
85
96
|
def message_template_params
|
86
97
|
params.require(:message_template).permit(:status, :title, :body, :locale)
|
87
98
|
end
|
@@ -1,8 +1,7 @@
|
|
1
1
|
class MessagesController < ApplicationController
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
after_filter :solr_commit, only: [:create, :update, :destroy, :destroy_selected]
|
2
|
+
before_action :set_message, only: [:show, :edit, :update, :destroy]
|
3
|
+
before_action :check_policy, only: [:index, :new, :create, :destroy_selected]
|
4
|
+
before_action :get_user, only: :index
|
6
5
|
|
7
6
|
# GET /messages
|
8
7
|
# GET /messages.json
|
@@ -43,7 +42,6 @@ class MessagesController < ApplicationController
|
|
43
42
|
# GET /messages/1
|
44
43
|
# GET /messages/1.json
|
45
44
|
def show
|
46
|
-
@message = current_user.received_messages.find(params[:id])
|
47
45
|
@message.transition_to!(:read) if @message.current_state != 'read'
|
48
46
|
|
49
47
|
respond_to do |format|
|
@@ -131,7 +129,7 @@ class MessagesController < ApplicationController
|
|
131
129
|
end
|
132
130
|
if messages.present?
|
133
131
|
messages.each do |message|
|
134
|
-
message.destroy
|
132
|
+
message.destroy if message.receiver == current_user
|
135
133
|
end
|
136
134
|
flash[:notice] = t('message.messages_were_deleted')
|
137
135
|
format.html { redirect_to messages_url }
|
@@ -143,6 +141,19 @@ class MessagesController < ApplicationController
|
|
143
141
|
end
|
144
142
|
|
145
143
|
private
|
144
|
+
def set_message
|
145
|
+
if current_user
|
146
|
+
@message = current_user.received_messages.find(params[:id])
|
147
|
+
authorize @message
|
148
|
+
else
|
149
|
+
access_denied; return
|
150
|
+
end
|
151
|
+
end
|
152
|
+
|
153
|
+
def check_policy
|
154
|
+
authorize Message
|
155
|
+
end
|
156
|
+
|
146
157
|
def message_params
|
147
158
|
params.require(:message).permit(
|
148
159
|
:subject, :body, :sender, :recipient, :parent_id
|
@@ -0,0 +1,21 @@
|
|
1
|
+
module EnjuMessage
|
2
|
+
module EnjuUser
|
3
|
+
extend ActiveSupport::Concern
|
4
|
+
|
5
|
+
included do
|
6
|
+
has_many :sent_messages, :foreign_key => 'sender_id', :class_name => 'Message'
|
7
|
+
has_many :received_messages, :foreign_key => 'receiver_id', :class_name => 'Message'
|
8
|
+
end
|
9
|
+
|
10
|
+
def send_message(status, options = {})
|
11
|
+
MessageRequest.transaction do
|
12
|
+
request = MessageRequest.new
|
13
|
+
request.sender = self.class.find(1)
|
14
|
+
request.receiver = self
|
15
|
+
request.message_template = MessageTemplate.localized_template(status, profile.locale)
|
16
|
+
request.save_message_body(options)
|
17
|
+
request.transition_to!(:sent)
|
18
|
+
end
|
19
|
+
end
|
20
|
+
end
|
21
|
+
end
|
data/app/models/message.rb
CHANGED
@@ -0,0 +1,37 @@
|
|
1
|
+
class MessagePolicy < ApplicationPolicy
|
2
|
+
def index?
|
3
|
+
true if user.try(:has_role?, 'User')
|
4
|
+
end
|
5
|
+
|
6
|
+
def show?
|
7
|
+
case user.try(:role).try(:name)
|
8
|
+
when 'Administrator'
|
9
|
+
true
|
10
|
+
when 'Librarian'
|
11
|
+
true if record.try(:receiver) == user
|
12
|
+
when 'User'
|
13
|
+
true if record.try(:receiver) == user
|
14
|
+
end
|
15
|
+
end
|
16
|
+
|
17
|
+
def create?
|
18
|
+
true if user.try(:has_role?, 'Librarian')
|
19
|
+
end
|
20
|
+
|
21
|
+
def update?
|
22
|
+
case user.try(:role).try(:name)
|
23
|
+
when 'Administrator'
|
24
|
+
true if record.try(:receiver) == user
|
25
|
+
when 'Librarian'
|
26
|
+
true if record.try(:receiver) == user
|
27
|
+
end
|
28
|
+
end
|
29
|
+
|
30
|
+
def destroy?
|
31
|
+
show?
|
32
|
+
end
|
33
|
+
|
34
|
+
def destroy_selected?
|
35
|
+
true if user.try(:has_role?, 'User')
|
36
|
+
end
|
37
|
+
end
|
@@ -0,0 +1,21 @@
|
|
1
|
+
class MessageRequestPolicy < ApplicationPolicy
|
2
|
+
def index?
|
3
|
+
true if user.try(:has_role?, 'Librarian')
|
4
|
+
end
|
5
|
+
|
6
|
+
def show?
|
7
|
+
true if user.try(:has_role?, 'Librarian')
|
8
|
+
end
|
9
|
+
|
10
|
+
def create?
|
11
|
+
false
|
12
|
+
end
|
13
|
+
|
14
|
+
def update?
|
15
|
+
true if user.try(:has_role?, 'Librarian')
|
16
|
+
end
|
17
|
+
|
18
|
+
def destroy?
|
19
|
+
true if user.try(:has_role?, 'Librarian')
|
20
|
+
end
|
21
|
+
end
|
@@ -0,0 +1,21 @@
|
|
1
|
+
class MessageTemplatePolicy < ApplicationPolicy
|
2
|
+
def index?
|
3
|
+
true if user.try(:has_role?, 'Librarian')
|
4
|
+
end
|
5
|
+
|
6
|
+
def show?
|
7
|
+
true if user.try(:has_role?, 'Librarian')
|
8
|
+
end
|
9
|
+
|
10
|
+
def create?
|
11
|
+
false
|
12
|
+
end
|
13
|
+
|
14
|
+
def update?
|
15
|
+
true if user.try(:has_role?, 'Administator')
|
16
|
+
end
|
17
|
+
|
18
|
+
def destroy?
|
19
|
+
false
|
20
|
+
end
|
21
|
+
end
|
@@ -49,7 +49,7 @@
|
|
49
49
|
<div id="submenu" class="ui-corner-all ui-widget-content">
|
50
50
|
<ul>
|
51
51
|
<li><%= link_to t('page.edit'), edit_message_request_path(@message_request) -%></li>
|
52
|
-
<li><%=
|
52
|
+
<li><%= link_to t('page.back'), :back -%></li>
|
53
53
|
<li><%= link_to t('message.send'), new_message_path(message_request_id: @message_request.id) -%></li>
|
54
54
|
</ul>
|
55
55
|
</div>
|
@@ -15,7 +15,7 @@
|
|
15
15
|
<%- @message_templates.each do |message_template| -%>
|
16
16
|
<tr class="line<%= cycle("0", "1") -%>">
|
17
17
|
<td>
|
18
|
-
<%- if
|
18
|
+
<%- if policy(message_template).update? -%>
|
19
19
|
<%= move_position(message_template) -%>
|
20
20
|
<%- end -%>
|
21
21
|
</td>
|
@@ -23,10 +23,10 @@
|
|
23
23
|
<td><%= message_template.locale -%></td>
|
24
24
|
<td><%= message_template.title -%></td>
|
25
25
|
<td>
|
26
|
-
<%- if
|
26
|
+
<%- if policy(message_template).update? -%>
|
27
27
|
<%= link_to t('page.edit'), edit_message_template_path(message_template) -%>
|
28
28
|
<% end %>
|
29
|
-
<%- if
|
29
|
+
<%- if policy(message_template).destroy? -%>
|
30
30
|
<%= link_to t('page.destroy'), message_template, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
|
31
31
|
<%- end -%>
|
32
32
|
</td>
|
@@ -40,7 +40,7 @@
|
|
40
40
|
|
41
41
|
<div id="submenu" class="ui-corner-all ui-widget-content">
|
42
42
|
<ul>
|
43
|
-
<%- if
|
43
|
+
<%- if policy(MessageTemplate).create? -%>
|
44
44
|
<li><%= link_to t('page.new', model: t('activerecord.models.message_template')), new_message_template_path -%></li>
|
45
45
|
<%- end -%>
|
46
46
|
</ul>
|
@@ -27,9 +27,9 @@
|
|
27
27
|
|
28
28
|
<div id="submenu" class="ui-corner-all ui-widget-content">
|
29
29
|
<ul>
|
30
|
-
<%- if
|
30
|
+
<%- if policy(@message_template).update? -%>
|
31
31
|
<li><%= link_to t('page.edit'), edit_message_template_path(@message_template) -%></li>
|
32
32
|
<%- end -%>
|
33
|
-
<li><%=
|
33
|
+
<li><%= link_to t('page.back'), :back -%></li>
|
34
34
|
</ul>
|
35
35
|
</div>
|
@@ -21,7 +21,7 @@
|
|
21
21
|
<%- @messages.each do |message| -%>
|
22
22
|
<tr class="line<%= cycle("0", "1") -%>">
|
23
23
|
<td>
|
24
|
-
<% if
|
24
|
+
<% if policy(message).destroy? %>
|
25
25
|
<input id="delete_<%=h message.id -%>" name="delete[]" type="checkbox" value="<%=h message.id %>" class="checkbox" />
|
26
26
|
<% end %>
|
27
27
|
</td>
|
@@ -64,7 +64,7 @@
|
|
64
64
|
</ul>
|
65
65
|
|
66
66
|
<ul>
|
67
|
-
<% if
|
67
|
+
<% if policy(Message).create? %>
|
68
68
|
<li><%= link_to t('page.new', model: t('activerecord.models.message')), new_message_path -%></li>
|
69
69
|
<% end %>
|
70
70
|
</ul>
|
@@ -40,10 +40,10 @@
|
|
40
40
|
<% else %>
|
41
41
|
<li><%= link_to t('page.listing', model: t('activerecord.models.message')), messages_path -%></li>
|
42
42
|
<% end %>
|
43
|
-
<% if
|
43
|
+
<% if policy(Message).create? %>
|
44
44
|
<li><%= link_to t('message.reply'), new_message_path(parent_id: @message.id) -%></li>
|
45
45
|
<% end %>
|
46
|
-
<% if
|
46
|
+
<% if policy(@message).destroy? %>
|
47
47
|
<li><%= link_to t('page.destroy'), @message, data: {confirm: t('page.are_you_sure')}, method: :delete -%></li>
|
48
48
|
<% end %>
|
49
49
|
</ul>
|
data/lib/enju_message/engine.rb
CHANGED
data/lib/enju_message/version.rb
CHANGED
data/lib/enju_message.rb
CHANGED
@@ -6,7 +6,8 @@ class EnjuMessage::SetupGenerator < Rails::Generators::Base
|
|
6
6
|
directory("db/fixtures", "db/fixtures/enju_message")
|
7
7
|
return if file == 'fixture'
|
8
8
|
rake("enju_message_engine:install:migrations")
|
9
|
-
|
10
|
-
"
|
9
|
+
inject_into_class "app/models/user.rb", User do
|
10
|
+
" include EnjuMessage::EnjuUser\n"
|
11
|
+
end
|
11
12
|
end
|
12
13
|
end
|
@@ -5,7 +5,7 @@ namespace :enju_message do
|
|
5
5
|
desc "create initial records for enju_message"
|
6
6
|
task :setup => :environment do
|
7
7
|
Dir.glob(Rails.root.to_s + '/db/fixtures/enju_message/*.yml').each do |file|
|
8
|
-
ActiveRecord::
|
8
|
+
ActiveRecord::FixtureSet.create_fixtures('db/fixtures/enju_message', File.basename(file, '.*'))
|
9
9
|
end
|
10
10
|
end
|
11
11
|
|
@@ -29,14 +29,14 @@ describe MessageRequestsController do
|
|
29
29
|
|
30
30
|
it "assigns all message_requests as @message_requests" do
|
31
31
|
get :index
|
32
|
-
assigns(:message_requests).should
|
32
|
+
assigns(:message_requests).should be_nil
|
33
33
|
end
|
34
34
|
end
|
35
35
|
|
36
36
|
describe "When not logged in" do
|
37
37
|
it "assigns all message_requests as @message_requests" do
|
38
38
|
get :index
|
39
|
-
assigns(:message_requests).should
|
39
|
+
assigns(:message_requests).should be_nil
|
40
40
|
end
|
41
41
|
end
|
42
42
|
end
|
@@ -29,7 +29,7 @@ describe MessageTemplatesController do
|
|
29
29
|
|
30
30
|
it "assigns empty as @message_templates" do
|
31
31
|
get :index
|
32
|
-
assigns(:message_templates).should
|
32
|
+
assigns(:message_templates).should be_nil
|
33
33
|
response.should be_forbidden
|
34
34
|
end
|
35
35
|
end
|
@@ -37,7 +37,7 @@ describe MessageTemplatesController do
|
|
37
37
|
describe "When not logged in" do
|
38
38
|
it "assigns empty as @message_templates" do
|
39
39
|
get :index
|
40
|
-
assigns(:message_templates).should
|
40
|
+
assigns(:message_templates).should be_nil
|
41
41
|
response.should redirect_to(new_user_session_url)
|
42
42
|
end
|
43
43
|
end
|
@@ -89,7 +89,7 @@ describe MessageTemplatesController do
|
|
89
89
|
|
90
90
|
it "assigns the requested message_template as @message_template" do
|
91
91
|
get :new
|
92
|
-
assigns(:message_template).
|
92
|
+
assigns(:message_template).should be_nil
|
93
93
|
response.should be_forbidden
|
94
94
|
end
|
95
95
|
end
|
@@ -99,7 +99,7 @@ describe MessageTemplatesController do
|
|
99
99
|
|
100
100
|
it "should not assign the requested message_template as @message_template" do
|
101
101
|
get :new
|
102
|
-
assigns(:message_template).
|
102
|
+
assigns(:message_template).should be_nil
|
103
103
|
response.should be_forbidden
|
104
104
|
end
|
105
105
|
end
|
@@ -109,7 +109,7 @@ describe MessageTemplatesController do
|
|
109
109
|
|
110
110
|
it "should not assign the requested message_template as @message_template" do
|
111
111
|
get :new
|
112
|
-
assigns(:message_template).
|
112
|
+
assigns(:message_template).should be_nil
|
113
113
|
response.should be_forbidden
|
114
114
|
end
|
115
115
|
end
|
@@ -117,7 +117,7 @@ describe MessageTemplatesController do
|
|
117
117
|
describe "When not logged in" do
|
118
118
|
it "should not assign the requested message_template as @message_template" do
|
119
119
|
get :new
|
120
|
-
assigns(:message_template).
|
120
|
+
assigns(:message_template).should be_nil
|
121
121
|
response.should redirect_to(new_user_session_url)
|
122
122
|
end
|
123
123
|
end
|
@@ -175,7 +175,7 @@ describe MessageTemplatesController do
|
|
175
175
|
describe "with valid params" do
|
176
176
|
it "assigns a newly created message_template as @message_template" do
|
177
177
|
post :create, :message_template => @attrs
|
178
|
-
assigns(:message_template).should
|
178
|
+
assigns(:message_template).should be_nil
|
179
179
|
end
|
180
180
|
|
181
181
|
it "should be forbidden" do
|
@@ -187,7 +187,7 @@ describe MessageTemplatesController do
|
|
187
187
|
describe "with invalid params" do
|
188
188
|
it "assigns a newly created but unsaved message_template as @message_template" do
|
189
189
|
post :create, :message_template => @invalid_attrs
|
190
|
-
assigns(:message_template).
|
190
|
+
assigns(:message_template).should be_nil
|
191
191
|
end
|
192
192
|
|
193
193
|
it "should be forbidden" do
|
@@ -203,7 +203,7 @@ describe MessageTemplatesController do
|
|
203
203
|
describe "with valid params" do
|
204
204
|
it "assigns a newly created message_template as @message_template" do
|
205
205
|
post :create, :message_template => @attrs
|
206
|
-
assigns(:message_template).should
|
206
|
+
assigns(:message_template).should be_nil
|
207
207
|
end
|
208
208
|
|
209
209
|
it "should be forbidden" do
|
@@ -215,7 +215,7 @@ describe MessageTemplatesController do
|
|
215
215
|
describe "with invalid params" do
|
216
216
|
it "assigns a newly created but unsaved message_template as @message_template" do
|
217
217
|
post :create, :message_template => @invalid_attrs
|
218
|
-
assigns(:message_template).
|
218
|
+
assigns(:message_template).should be_nil
|
219
219
|
end
|
220
220
|
|
221
221
|
it "should be forbidden" do
|
@@ -231,7 +231,7 @@ describe MessageTemplatesController do
|
|
231
231
|
describe "with valid params" do
|
232
232
|
it "assigns a newly created message_template as @message_template" do
|
233
233
|
post :create, :message_template => @attrs
|
234
|
-
assigns(:message_template).should
|
234
|
+
assigns(:message_template).should be_nil
|
235
235
|
end
|
236
236
|
|
237
237
|
it "should be forbidden" do
|
@@ -243,7 +243,7 @@ describe MessageTemplatesController do
|
|
243
243
|
describe "with invalid params" do
|
244
244
|
it "assigns a newly created but unsaved message_template as @message_template" do
|
245
245
|
post :create, :message_template => @invalid_attrs
|
246
|
-
assigns(:message_template).
|
246
|
+
assigns(:message_template).should be_nil
|
247
247
|
end
|
248
248
|
|
249
249
|
it "should be forbidden" do
|
@@ -257,7 +257,7 @@ describe MessageTemplatesController do
|
|
257
257
|
describe "with valid params" do
|
258
258
|
it "assigns a newly created message_template as @message_template" do
|
259
259
|
post :create, :message_template => @attrs
|
260
|
-
assigns(:message_template).should
|
260
|
+
assigns(:message_template).should be_nil
|
261
261
|
end
|
262
262
|
|
263
263
|
it "should be forbidden" do
|
@@ -269,7 +269,7 @@ describe MessageTemplatesController do
|
|
269
269
|
describe "with invalid params" do
|
270
270
|
it "assigns a newly created but unsaved message_template as @message_template" do
|
271
271
|
post :create, :message_template => @invalid_attrs
|
272
|
-
assigns(:message_template).
|
272
|
+
assigns(:message_template).should be_nil
|
273
273
|
end
|
274
274
|
|
275
275
|
it "should be forbidden" do
|