aboutsummaryrefslogtreecommitdiffstats
path: root/spec/models/user_spec.rb
diff options
context:
space:
mode:
authorvlatka pavisic2016-11-09 15:10:29 +0100
committervlatka pavisic2016-11-09 15:10:29 +0100
commit21c6807d2167ffdbcaed58844d1ebafb06c22d6e (patch)
treed4f0bca5b97266f08a956de2b946a1bf79a3e964 /spec/models/user_spec.rb
parent56c0f55d2d8d566b931664b85c76dbe3a58e31cc (diff)
parent0dbc80d54b1362c9eb0fc87d8d93f3d60ade68e1 (diff)
downloadchouette-core-21c6807d2167ffdbcaed58844d1ebafb06c22d6e.tar.bz2
Refs #1872 : Fix conflicts
Diffstat (limited to 'spec/models/user_spec.rb')
-rw-r--r--spec/models/user_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index c20e80ca1..bb43be63e 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -36,7 +36,7 @@ describe User, :type => :model do
it 'should store organisation functional_scope' do
User.authenticate_with_cas_ticket(ticket)
org = Organisation.find_by(code: ticket.extra_attributes[:organisation_code])
- expect(org.sso_attributes['functional_scope']).to eq "[STIF:CODIFLIGNE:Line:C00840, STIF:CODIFLIGNE:Line:C00086]"
+ expect(org.sso_attributes['functional_scope']).to eq "[\"STIF:CODIFLIGNE:Line:C00840\", \"STIF:CODIFLIGNE:Line:C00086\"]"
end
it 'should not create a new organisation if organisation is already present' do