cadenero 0.0.2.a2 → 0.0.2.a3

data/spec/features/accounts/sign_up_spec.rb

@@ -11,7 +11,7 @@ end
 
 def sign_up
   create_account
-  post "/v1/accounts", account: @visitor
+  post "/v1/accounts", format: :json, account: @visitor
   find_account_by_name
 end
 
@@ -19,11 +19,13 @@ feature 'Accounts' do
   scenario "creating an account" do
     sign_up
     expect(last_response.status).to eq 201
-    expect(JSON.parse(last_response.body)).to have_content "auth_token"
+    expect(JSON.parse(last_response.body)).to have_content "authentication_token"
+    expect(JSON.parse(last_response.body)["account"]["authentication_token"]).not_to eq nil
   end
 
   scenario "cannot create an account with an already used subdomain" do
-    Cadenero::V1::Account.create!(:subdomain => "test", :name => "Testy")
+    create_account
+    Cadenero::V1::Account.create!(@visitor)
     sign_up
     expect(last_response.status).to eq 422
     errors = { errors: {subdomain:["has already been taken"]} }

data/spec/features/cadenero/account_spec.rb

@@ -12,7 +12,6 @@ feature Cadenero::V1::Account do
       }
     }
     account = Cadenero::V1::Account.create_with_owner(params)
-    account.should be_persisted
     account.users.first.should == account.owner
   end
 

data/spec/features/users/sign_in_spec.rb

@@ -35,24 +35,27 @@ feature 'User sign in' do
       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"]
+      expect(JSON.parse(last_response.body)).to have_content "auth_token"
+      access_token = JSON.parse(last_response.body)["user"]["auth_token"]
+      expect(JSON.parse(last_response.body)["user"]["auth_token"]).to eq account.authentication_token
       get root_url
+      expect(last_response.status).to eq 200
       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(last_response.status).to eq 200
       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
+      expect(last_response.body).to eql(errors_redirect_ro_sign_in)
     end
+
   end
 
   it "attempts sign in with an invalid password and fails" do

data/spec/features/users/sign_up_spec.rb

@@ -10,7 +10,7 @@ end
 
 def sign_up_user(url)
   create_account_user
-  post "#{url}/v1/users", user: @user
+  post "#{url}/v1/users", format: :json, user: @user
   find_account_by_email
 end
 
@@ -20,7 +20,7 @@ feature "User signup" do
   scenario "under an account" do
     sign_up_user root_url
     expect(last_response.status).to eq 201
-    expect(JSON.parse(last_response.body)["user"]["account_ids"]).to eq [account.id]
+    expect(JSON.parse(last_response.body)["user"]["membership_ids"]).to eq [account.id]
     expect(last_request.url).to eq "#{root_url}v1/users"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cadenero
 version: !ruby/object:Gem::Version
-  version: 0.0.2.a2
+  version: 0.0.2.a3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-28 00:00:00.000000000 Z
+date: 2013-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails-api