fix moar specs

pull/14526/head
Alberto Romeu 6 years ago
parent 26d47a6898
commit 29a5c93f52

@ -21,7 +21,7 @@ module Carto
end
if user
if user.username.casecmp(password).zero?
if user.username && user.username.casecmp(password).zero?
errors << "must be different than the user name"
end

@ -403,7 +403,7 @@ describe User do
it 'should store feature flags' do
ff = FactoryGirl.create(:feature_flag, id: 10001, name: 'ff10001')
user = create_user :email => 'ff@example.com', :username => 'ff-user-01', :password => 'ff-user-01'
user = create_user :email => 'ff@example.com', :username => 'ff-user-01', :password => '000ff-user-01'
user.set_relationships_from_central({ feature_flags: [ ff.id.to_s ]})
user.save
user.feature_flags_user.map { |ffu| ffu.feature_flag_id }.should include(ff.id)
@ -413,7 +413,7 @@ describe User do
it 'should delete feature flags assignations to a deleted user' do
ff = FactoryGirl.create(:feature_flag, id: 10002, name: 'ff10002')
user = create_user :email => 'ff2@example.com', :username => 'ff2-user-01', :password => 'ff2-user-01'
user = create_user :email => 'ff2@example.com', :username => 'ff2-user-01', :password => '000ff2-user-01'
user.set_relationships_from_central({ feature_flags: [ ff.id.to_s ]})
user.save
user_id = user.id
@ -489,7 +489,7 @@ describe User do
user = ::User.new
user.username = "adminipop"
user.email = "adminipop@example.com"
user.password = user.password_confirmation = '000123456'
user.password = user.password_confirmation = '123456'
user.valid?.should be_false
user.errors[:password].should be_present

@ -338,7 +338,7 @@ feature "Sessions" do
def send_login_form(user)
fill_in 'email', :with => user.email
fill_in 'password', :with => user.username
fill_in 'password', :with => user.password
click_link_or_button 'Log in'
end

@ -66,7 +66,7 @@ describe 'Warden' do
before(:all) do
@user = FactoryGirl.create(:valid_user)
@user.password = @user.password_confirmation = 'qwaszx'
@user.password = @user.password_confirmation = '000qwaszx'
@user.save
end
@ -263,7 +263,7 @@ describe 'Warden' do
describe 'with Sequel user' do
it_behaves_like 'login locked' do
before(:all) do
@user = FactoryGirl.create(:user, password: 'qwaszx', password_confirmation: 'qwaszx')
@user = FactoryGirl.create(:user, password: '000qwaszx', password_confirmation: '000qwaszx')
end
after(:all) do
@ -275,7 +275,7 @@ describe 'Warden' do
describe 'with AR user' do
it_behaves_like 'login locked' do
before(:all) do
@user = FactoryGirl.create(:carto_user, password: 'qwaszx', password_confirmation: 'qwaszx')
@user = FactoryGirl.create(:carto_user, password: '000qwaszx', password_confirmation: '000qwaszx')
end
after(:all) do

@ -132,7 +132,7 @@ module CartoDB
user = create_user(
username: username,
email: "#{username}@example.com",
password: "#{username}000",
password: "000#{username}",
private_tables_enabled: true,
database_schema: organization.nil? ? 'public' : username,
organization: organization,

Loading…
Cancel
Save