cadenero 0.0.2.b4 → 0.0.2.b5

data/spec/features/accounts/sign_up_spec.rb

@@ -14,7 +14,7 @@ feature 'Accounts' do
   end
 
   scenario "cannot create an account with an already used subdomain" do
-    Cadenero::V1::Account.create!(create_account)
+    Cadenero::V1::Account.create!(create_account_params_json)
     sign_up_account
     expected_json_errors(errors_already_taken_subdomain)
   end

data/spec/features/users/sign_in_spec.rb

@@ -5,7 +5,6 @@ require 'cadenero/testing_support/authentication_helpers'
 feature 'User sign in' do
   extend Cadenero::TestingSupport::SubdomainHelpers
   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}
@@ -18,44 +17,70 @@ feature 'User sign in' do
   within_account_subdomain do
     scenario "signs in as an account owner successfully" do
       check_error_for_not_signed_in_yet
-      user_email = successful_sign_in_owner(account)
+      user_email = successful_sign_in_owner account
       get root_url
       expect(last_response.status).to eq 200
       expect(json_last_response_body["message"]).to have_content user_email
     end
 
+    scenario "signs in as a user successfully" do
+      check_error_for_not_signed_in_yet
+      second_user_email = successful_sign_up_user_in_existing_account account, "_second"
+      second_user = Cadenero::User.where(email: second_user_email).first
+      successful_sign_in_user(account, account_user_params_json(second_user))
+      get root_url
+      expect(last_response.status).to eq 200
+      expect(json_last_response_body["message"]).to have_content second_user_email
+    end
+
     scenario "signout as an account owner successfully" do
-      user_email = successful_sign_in_owner(account)
+      user_email = successful_sign_in_owner account 
       delete sessions_url, id: account.owner.id
       expect(last_response.status).to eq 200
       expect(json_last_response_body["message"]).to have_content "Successful logout"
       check_error_for_not_signed_in_yet
     end
 
-  end
+    scenario "two users of the same account should have different auth_tokens" do
+      user_email = successful_sign_in_owner account
+      user_auth_token = json_last_response_body["user"]["auth_token"]
+      user = Cadenero::User.where(email: user_email).first
+      delete sessions_url, id: user.id
+      check_error_for_not_signed_in_yet
+      second_user_email = successful_sign_up_user_in_existing_account account, "_second"
+      second_user = Cadenero::User.where(email: second_user_email).first
+      successful_sign_in_user(account, account_user_params_json(second_user))
+      second_user_auth_token = json_last_response_body["user"]["auth_token"]
+      expect(second_user_auth_token).not_to eq([])
+      expect(user).not_to eq(second_user)
+      expect(user_auth_token).not_to eq(second_user_auth_token)
+    end
 
-  it "attempts sign in with an invalid password and fails" do
-    check_error_for_not_signed_in_yet
-    sign_in_user sessions_url, { email: "user@example.com", password: "" }
-    expected_json_errors(errors_invalid_email_or_password)
   end
 
-  it "attempts sign in with an invalid email address and fails" do
-    check_error_for_not_signed_in_yet
-    sign_in_user sessions_url, { email: "foo@example.com", password: "password"}
-    expected_json_errors(errors_invalid_email_or_password)
-  end
+  context "without sign in" do
+    scenario "attempts sign in with an invalid password and fails" do
+      check_error_for_not_signed_in_yet
+      sign_in_user sessions_url, { email: "user@example.com", password: "" }
+      expected_json_errors(errors_invalid_email_or_password)
+    end
 
-  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: "" }
-    expected_json_errors(errors_invalid_email_or_password)
-  end
+    scenario "attempts sign in with an invalid email address and fails" do
+      check_error_for_not_signed_in_yet
+      sign_in_user sessions_url, { email: "foo@example.com", password: "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)
-    expected_json_errors(errors_invalid_subdomain)
-  end   
+    scenario "cannot sign in if not a member of an existing subdomain" do
+      other_account = FactoryGirl.create(:account)
+      check_error_for_not_signed_in_yet
+      sign_in_user sessions_url, { email: other_account.owner.email, password: "password" }
+      expected_json_errors(errors_invalid_email_or_password)
+    end
+
+    scenario "cannot sign in if the subdomain does not exist" do 
+      sign_in_user error_url, account_user_params_json(account.owner)
+      expected_json_errors(errors_invalid_subdomain)
+    end
+  end 
 end

data/spec/features/users/sign_up_spec.rb

@@ -7,24 +7,17 @@ feature "User signup" do
   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
-    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]
+    user_email = successful_sign_up_user_in_existing_account account
+    expect(user_email).to eq("user@example.com")
   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]
+    account_user_email = successful_sign_up_user_in_existing_account account
+    owner = Cadenero::User.where(email: account_user_email).first
+    second_account = FactoryGirl.create(:account_with_schema, owner: owner)
+    second_account_user_email = successful_sign_up_user_in_existing_account second_account
+    get "#{root_url}v1/users/#{owner.id}"
+    expect_subject_ids_to_have("user", "membership_ids", [second_account.id, account.id], 200)
     get "#{root_url}v1/users"
     expect(json_last_response_body["users"].length).to eq 2
   end

data/spec/generators/install_generator_spec.rb

@@ -8,15 +8,18 @@ describe Cadenero::Generators::InstallGenerator do
   # So we can know whether to backup or restore in cleanup!
   # Wish RSpec had a setting for this already
   before { flag_example! }
+
+  # For the example flag its run metadata to true
   def flag_example!
     example.metadata[:run] = true
   end
 
+  # Sort the migrations
   def migrations
     Dir["#{Rails.root}/db/migrate/*.rb"].sort
   end
 
-  it "copies over the migrations" do
+  it "runs the installer correctly" do
     migrations.should be_empty
     capture(:stdout) do
       described_class.start(["--user-class=User", "--no-migrate", "--current-user-helper=current_user", 
@@ -40,16 +43,48 @@ describe Cadenero::Generators::InstallGenerator do
   helper_method :cadenero_user
 
 }
-    application_controller.should include(expected_cadenero_user_method)
-    Cadenero::V1::Account.count.should == 0
-    Cadenero::User.count.should == 0
+    expect(application_controller).to include(expected_cadenero_user_method)
+    expect(Cadenero::V1::Account.count).to eq 0
+    expect(Cadenero::User.count).to eq 0
 
     FactoryGirl.create(:account)
     FactoryGirl.create(:user)
     Cadenero::Engine.load_seed
 
-    Cadenero::V1::Account.count.should == 2
-    Cadenero::User.count.should == 3
+    expect(Cadenero::V1::Account.count).to eq 2
+    expect(Cadenero::User.count).to eq  3
+  end
+
+  it "should add /config/initializers/cadenero.rb with Template if doesn't exist" do
+    FileUtils.rm("#{Rails.root}/config/initializers/cadenero.rb")
+    subject.add_cadenero_initializer
+    expect(File.exist?("#{Rails.root}/config/initializers/cadenero.rb")).to be_true 
+    cadenero_initializer = File.read("#{Rails.root}/config/initializers/cadenero.rb")
+    expect(cadenero_initializer).to include("Cadenero.user_class =")
+  end
+
+  it "should run the Cadenero migrations" do
+    subject.run_migrations
+    expect(Cadenero::User.columns.map{|column| {name: column.name}}).to eq [{:name=>"id"}, 
+                                                                            {:name=>"email"}, 
+                                                                            {:name=>"password_digest"}, 
+                                                                            {:name=>"created_at"}, 
+                                                                            {:name=>"updated_at"}]
+  end
+
+  context "no-migrate" do
+    before { subject.stub :options => {"no-migrate" => true}}
+    it "should not load the seeds" do
+      subject.seed_database
+      expect(Cadenero::V1::Account.count).to eq 0
+      expect(Cadenero::User.count).to eq 0      
+    end
+    it "should not output as a finished message that the migrations were run" do
+      output = capture(:stdout) do
+        subject.finished
+      end
+      expect(output).not_to include("rake db:migrate")    
+    end
   end
 
 end

data/spec/models/cadenero/member_spec.rb

@@ -2,6 +2,16 @@ require 'spec_helper'
 
 module Cadenero
   describe Member do
-    
+    let!(:user) { stub_model(Cadenero::User, id: 101, email: "testy@example.com", password: "12345678")}
+    let!(:account) { stub_model(Cadenero::V1::Account, id: 1001, authentication_token: "dsdaefer412add", 
+      owner: user) }
+
+    it "should have the auth_token" do
+      member = Member.new
+      member.account = account
+      member.user = user
+      member.save!
+      expect(member.auth_token).not_to eq(nil)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cadenero
 version: !ruby/object:Gem::Version
-  version: 0.0.2.b4
+  version: 0.0.2.b5
 platform: ruby
 authors:
 - Manuel Vidaurre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2013-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails-api
@@ -225,6 +225,7 @@ files:
 - db/migrate/20130612061604_create_cadenero_v1_accounts.rb
 - db/migrate/20130612064652_create_cadenero_v1_users.rb
 - db/migrate/20130612073709_create_cadenero_v1_members.rb
+- db/migrate/20130715174857_add_auth_token_to_cadenero_members.rb
 - db/seeds.rb
 - lib/cadenero/active_record_extensions.rb
 - lib/cadenero/constraints/subdomain_required.rb
@@ -240,6 +241,7 @@ files:
 - Rakefile
 - README.md
 - spec/controllers/cadenero/v1/accounts_controller_spec.rb
+- spec/controllers/cadenero/v1/users_controller_spec.rb
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
@@ -311,6 +313,7 @@ specification_version: 4
 summary: Rails.API Engine for manage multitenant authentication
 test_files:
 - spec/controllers/cadenero/v1/accounts_controller_spec.rb
+- spec/controllers/cadenero/v1/users_controller_spec.rb
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb