cadenero 0.0.2.b3 → 0.0.2.b4

data/spec/features/accounts/sign_up_spec.rb

@@ -1,34 +1,21 @@
 require 'spec_helper'
+require 'cadenero/testing_support/authentication_helpers'
 
-def create_account
-  @visitor ||= { name: "Testy", subdomain: "test", owner_attributes:
-    {email: "testy@example.com", password: "changeme", password_confirmation: "changeme"} }
-end
-
-def find_account_by_name
-  @account = Cadenero::V1::Account.where(name: @visitor[:name]).first
-end
+feature 'Accounts' do
+  include Cadenero::TestingSupport::AuthenticationHelpers
 
-def sign_up
-  create_account
-  post "/v1/accounts", format: :json, account: @visitor
-  find_account_by_name
-end
+  let(:errors_already_taken_subdomain)  {{ errors: {subdomain:["has already been taken"]} }.to_json} 
 
-feature 'Accounts' do
   scenario "creating an account" do
-    sign_up
+    sign_up_account
     expect(last_response.status).to eq 201
-    expect(JSON.parse(last_response.body)).to have_content "authentication_token"
-    expect(JSON.parse(last_response.body)["account"]["authentication_token"]).not_to eq nil
+    expect(json_last_response_body).to have_content "authentication_token"
+    expect(json_last_response_body["account"]["authentication_token"]).not_to eq nil
   end
 
   scenario "cannot create an account with an already used subdomain" do
-    create_account
-    Cadenero::V1::Account.create!(@visitor)
-    sign_up
-    expect(last_response.status).to eq 422
-    errors = { errors: {subdomain:["has already been taken"]} }
-    expect(last_response.body).to eql(errors.to_json)
+    Cadenero::V1::Account.create!(create_account)
+    sign_up_account
+    expected_json_errors(errors_already_taken_subdomain)
   end
 end

data/spec/features/users/sign_in_spec.rb

@@ -1,26 +1,11 @@
 require 'spec_helper'
 require 'cadenero/testing_support/subdomain_helpers'
+require 'cadenero/testing_support/authentication_helpers'
 
 feature 'User sign in' do
   extend Cadenero::TestingSupport::SubdomainHelpers
-
-  def create_account_user
-    @user ||= { email: "user@example.com", password: "password" }
-  end
-
-  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}", format: :json, user: user
-    find_account_by_email
-  end
+  include Cadenero::TestingSupport::AuthenticationHelpers
+ 
 
   let(:account) { FactoryGirl.create(:account_with_schema) }
   let(:errors_redirect_ro_sign_in) {{errors: %Q{Please sign in. posting the user json credentials as: {"user": {"email": "testy2@example.com", "password": "changeme"}} to /v1/sessions}, links: "/v1/sessions"}.to_json}
@@ -32,64 +17,45 @@ feature 'User sign in' do
 
   within_account_subdomain do
     scenario "signs in as an account owner successfully" do
-      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
-      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"]
-      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
+      check_error_for_not_signed_in_yet
+      user_email = successful_sign_in_owner(account)
       get root_url
       expect(last_response.status).to eq 200
-      expect(JSON.parse(last_response.body)["message"]).to have_content user_email
+      expect(json_last_response_body["message"]).to have_content user_email
     end
 
     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"]
+      user_email = successful_sign_in_owner(account)
       delete sessions_url, id: account.owner.id
       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.status).to eq 422
-      expect(last_response.body).to eql(errors_redirect_ro_sign_in)
+      expect(json_last_response_body["message"]).to have_content "Successful logout"
+      check_error_for_not_signed_in_yet
     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)
+    check_error_for_not_signed_in_yet
     sign_in_user sessions_url, { email: "user@example.com", password: "" }
-    expect(last_response.status).to eq 422
-    expect(last_response.body).to eql(errors_invalid_email_or_password)
+    expected_json_errors(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)
+    check_error_for_not_signed_in_yet
     sign_in_user sessions_url, { email: "foo@example.com", password: "password"}
-    expect(last_response.status).to eq 422
-    expect(last_response.body).to eql(errors_invalid_email_or_password)
+    expected_json_errors(errors_invalid_email_or_password)
   end
 
-  it "cannot sign in if not a part of an existing subdomain" do
+  it "cannot sign in if not a member of an existing 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 sessions_url, { email: other_account.owner.email, password: "" }
-    expect(last_response.status).to eq 422
-    expect(last_response.body).to eql(errors_invalid_email_or_password)
+    expected_json_errors(errors_invalid_email_or_password)
   end
 
   it "cannot sign in if the subdomain does not exist" do 
     sign_in_user error_url, account_user(account.owner)
-    expect(last_response.status).to eq 422
-    expect(last_response.body).to eql(errors_invalid_subdomain)
+    expected_json_errors(errors_invalid_subdomain)
   end   
 end

data/spec/features/users/sign_up_spec.rb

@@ -1,27 +1,32 @@
 require 'spec_helper'
-
-def create_account_user
-  @user ||= { email: "user@example.com", password: "password", password_confirmation: "password" }
-end
-
-def find_account_by_email
-  @account = Cadenero::V1::Account.where(name: @user[:email]).first
-end
-
-def sign_up_user(url)
-  create_account_user
-  post "#{url}/v1/users", format: :json, user: @user
-  find_account_by_email
-end
+require 'cadenero/testing_support/authentication_helpers'
 
 feature "User signup" do
-  let(:account) { FactoryGirl.create(:account_with_schema) }
+  include Cadenero::TestingSupport::AuthenticationHelpers
+
+  let!(:account) { FactoryGirl.create(:account_with_schema) }
   let(:root_url) { "http://#{account.subdomain}.example.com/" }
   scenario "under an account" do
     sign_up_user root_url
     expect(last_response.status).to eq 201
-    puts "last_response.body: #{last_response.body}"
-    expect(JSON.parse(last_response.body)["user"]["membership_ids"]).to eq [account.id]
+    expect(json_last_response_body["user"]["membership_ids"]).to eq [account.id]
     expect(last_request.url).to eq "#{root_url}v1/users"
+    get "#{root_url}v1/users/#{json_last_response_body['user']['id']}"
+    expect(json_last_response_body["user"]["membership_ids"]).to eq [account.id]
   end
+
+  scenario "under two accounts" do
+    sign_up_user root_url
+    user_id = json_last_response_body['user']['id']
+    get "#{root_url}v1/users/#{user_id}"
+    expect(json_last_response_body["user"]["membership_ids"]).to eq [account.id]
+    second_account = FactoryGirl.create(:account_with_schema, owner: Cadenero::User.where(id: user_id).first)
+    sign_up_user "http://#{second_account.subdomain}.example.com/"
+    expect(json_last_response_body["user"]["membership_ids"]).to eq [second_account.id]
+    get "#{root_url}v1/users/#{user_id}"
+    expect(json_last_response_body["user"]["membership_ids"]).to eq [account.id, second_account.id]
+    get "#{root_url}v1/users"
+    expect(json_last_response_body["users"].length).to eq 2
+  end
+
 end

data/spec/support/factories/user_factory.rb

@@ -2,6 +2,5 @@ FactoryGirl.define do
   factory :user, :class => Cadenero::User do
     sequence(:email) { |n| "user#{n}@example.com" }
     password "password"
-    password_confirmation "password"
   end
 end 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cadenero
 version: !ruby/object:Gem::Version
-  version: 0.0.2.b3
+  version: 0.0.2.b4
 platform: ruby
 authors:
 - Manuel Vidaurre
@@ -10,20 +10,6 @@ bindir: bin
 cert_chain: []
 date: 2013-07-12 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: actionpack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: rails-api
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +66,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.22'
+- !ruby/object:Gem::Dependency
+  name: strong_parameters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
   requirement: !ruby/object:Gem::Requirement
@@ -192,20 +192,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.1
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: A Rails.API Engine that use Warden for authenticate users using a RESTful
   API in a multitenant way
 email:
@@ -233,7 +219,6 @@ files:
 - app/serializers/cadenero/account_serializer.rb
 - app/serializers/cadenero/user_serializer.rb
 - config/initializers/apartment.rb
-- config/initializers/strong_parameters.rb
 - config/initializers/warden/strategies/password.rb
 - config/initializers/warden.rb
 - config/routes.rb
@@ -244,6 +229,7 @@ files:
 - lib/cadenero/active_record_extensions.rb
 - lib/cadenero/constraints/subdomain_required.rb
 - lib/cadenero/engine.rb
+- lib/cadenero/testing_support/authentication_helpers.rb
 - lib/cadenero/testing_support/subdomain_helpers.rb
 - lib/cadenero/version.rb
 - lib/cadenero.rb
@@ -262,12 +248,9 @@ files:
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/cadenero.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/secret_token.rb
-- spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
@@ -336,12 +319,9 @@ test_files:
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/cadenero.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/secret_token.rb
-- spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
@@ -376,4 +356,3 @@ test_files:
 - spec/support/factories/account_factory.rb
 - spec/support/factories/user_factory.rb
 - spec/support/generator_macros.rb
-has_rdoc: 

data/config/initializers/strong_parameters.rb

@@ -1 +0,0 @@
-ActionController::API.send :include, ActionController::StrongParameters

data/spec/dummy/config/initializers/backtrace_silencers.rb

@@ -1,7 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
-# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
-
-# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
-# Rails.backtrace_cleaner.remove_silencers!

data/spec/dummy/config/initializers/inflections.rb

@@ -1,15 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Add new inflection rules using the following format
-# (all these examples are active by default):
-# ActiveSupport::Inflector.inflections do |inflect|
-#   inflect.plural /^(ox)$/i, '\1en'
-#   inflect.singular /^(ox)en/i, '\1'
-#   inflect.irregular 'person', 'people'
-#   inflect.uncountable %w( fish sheep )
-# end
-#
-# These inflection rules are supported but not enabled by default:
-# ActiveSupport::Inflector.inflections do |inflect|
-#   inflect.acronym 'RESTful'
-# end

data/spec/dummy/config/initializers/mime_types.rb

@@ -1,5 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Add new mime types for use in respond_to blocks:
-# Mime::Type.register "text/richtext", :rtf
-# Mime::Type.register_alias "text/html", :iphone

data/spec/dummy/config/initializers/session_store.rb

@@ -1,8 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-Dummy::Application.config.session_store :cookie_store, key: '_dummy_session'
-
-# Use the database for sessions instead of the cookie-based default,
-# which shouldn't be used to store highly confidential information
-# (create the session table with "rails generate session_migration")
-# Dummy::Application.config.session_store :active_record_store