spec/features/users/sign_in_spec.rb in cadenero-0.0.2.a vs spec/features/users/sign_in_spec.rb in cadenero-0.0.2.a1

@@ -4,60 +4,79 @@
 
   def create_account_user
     @user ||= { email: "[e-mail]", password: "password", password_confirmation: "password" }
   end
 
-  def sign_in_account_user(user)
-    @user = { email: user.email, password: "password", password_confirmation: "password" }
+  def account_user(user)
+    @user = { email: user.email, password: "password" }
   end
 
   def find_account_by_email
     create_account_user
     @account = Cadenero::V1::Account.where(name: @user[:email]).first
   end
 
   def sign_in_user(url, user)
-    post "#{url}", user: user
+    post "#{url}", format: :json, user: user
     find_account_by_email
   end
 
   let(:account) { FactoryGirl.create(:account_with_schema) }
-  let(:errors_redirect_ro_sign_in) {{errors: "Please sign in. posting the user json credentials to /v1/sign_in", links: "/v1/sign_in"}.to_json}
+  let(:errors_redirect_ro_sign_in) {{errors: %Q{Please sign in. posting the user json credentials as: {"user": {"email": "[e-mail]", "password": "changeme"}} to /v1/sessions}, links: "/v1/sessions"}.to_json}
   let(:errors_invalid_email_or_password)  {{ errors: {user:["Invalid email or password"]} }.to_json} 
-  let(:sign_in_url) { "http://#{account.subdomain}.example.com/v1/sign_in" }
+  let(:sessions_url) { "http://#{account.subdomain}.example.com/v1/sessions" }
   let(:root_url) { "http://#{account.subdomain}.example.com/v1" }
 
   within_account_subdomain do
     scenario "signs in as an account owner successfully" do
-      get root_url
+      get cadenero.v1_root_url(:subdomain => account.subdomain)
       expect(last_response.body).to eql(errors_redirect_ro_sign_in)
-      sign_in_user sign_in_url, sign_in_account_user(account.owner)
+      expect(last_response.status).to eq 422
+      sign_in_user sessions_url, account_user(account.owner)
       expect(last_response.status).to eq 201
       expect(JSON.parse(last_response.body)["user"]["account_ids"]).to eq [account.id]
+      user_email = JSON.parse(last_response.body)["user"]["email"]
+      get root_url
+      expect(JSON.parse(last_response.body)["message"]).to have_content user_email
     end
   end
 
+  within_account_subdomain do
+    scenario "signout as an account owner successfully" do
+      sign_in_user sessions_url, account_user(account.owner)
+      expect(last_response.status).to eq 201
+      expect(JSON.parse(last_response.body)["user"]["account_ids"]).to eq [account.id]
+      user_email = JSON.parse(last_response.body)["user"]["email"]
+      delete sessions_url, id: account.owner.id
+      expect(last_response.status).to eq 201
+      expect(JSON.parse(last_response.body)["message"]).to have_content "Successful logout"
+      get cadenero.v1_root_url(:subdomain => account.subdomain)
+      expect(last_response.body).to eql(errors_redirect_ro_sign_in)
+      expect(last_response.status).to eq 422
+    end
+  end
+
   it "attempts sign in with an invalid password and fails" do
     get cadenero.v1_root_url(:subdomain => account.subdomain)
     expect(last_response.body).to eql(errors_redirect_ro_sign_in)
-    sign_in_user sign_in_url, { email: "[e-mail]", password: "", password_confirmation: "" }
+    sign_in_user sessions_url, { email: "[e-mail]", password: "", password_confirmation: "" }
     expect(last_response.status).to eq 422
     expect(last_response.body).to eql(errors_invalid_email_or_password)
   end
 
   it "attempts sign in with an invalid email address and fails" do
     get cadenero.v1_root_url(:subdomain => account.subdomain)
     expect(last_response.body).to eql(errors_redirect_ro_sign_in)
-    sign_in_user sign_in_url, { email: "[e-mail]", password: "password", password_confirmation: "password" }
+    sign_in_user sessions_url, { email: "[e-mail]", password: "password", password_confirmation: "password" }
     expect(last_response.status).to eq 422
     expect(last_response.body).to eql(errors_invalid_email_or_password)
   end
 
   it "cannot sign in if not a part of this subdomain" do
     other_account = FactoryGirl.create(:account)
     get cadenero.v1_root_url(:subdomain => account.subdomain)
     expect(last_response.body).to eql(errors_redirect_ro_sign_in)
-    sign_in_user sign_in_url, { email: other_account.owner.email, password: "", password_confirmation: "" }
+    sign_in_user sessions_url, { email: other_account.owner.email, password: "", password_confirmation: "" }
     expect(last_response.status).to eq 422
     expect(last_response.body).to eql(errors_invalid_email_or_password)
   end  
 end
\ No newline at end of file