Solve visualizations cleanup in zeus_plan instead of each spec

pull/11636/head
Javier Torres 8 years ago
parent 9ac1d0ff45
commit d42e6f6f52

@ -20,7 +20,6 @@ describe Visualization::Member do
end
after(:all) do
Carto::User.find(@user.id).visualizations.each(&:delete)
@user.destroy
end
@ -32,7 +31,7 @@ describe Visualization::Member do
user_name = 'whatever'
user_apikey = '123'
@user_mock = mock
@user_mock.stubs(:id).returns(@user.id)
@user_mock.stubs(:id).returns(user_id)
@user_mock.stubs(:username).returns(user_name)
@user_mock.stubs(:api_key).returns(user_apikey)
@user_mock.stubs(:viewer).returns(false)

@ -251,9 +251,9 @@ describe Admin::VisualizationsController do
end
it 'returns public map for org users' do
org = OrganizationFactory.new.new_organization(name: 'public-map-spec-org').save
org = OrganizationFactory.new.new_organization.save
user_a = create_user({username: 'user-public-map', quota_in_bytes: 123456789, table_quota: 400})
user_a = create_user(quota_in_bytes: 123456789, table_quota: 400)
user_org = CartoDB::UserOrganization.new(org.id, user_a.id)
user_org.promote_user_to_admin

@ -1,10 +1,14 @@
require 'helpers/unique_names_helper'
module CartoDB
module Factories
include UniqueNamesHelper
def new_organization(attributes = {})
organization = Organization.new
organization.name = attributes[:name] || 'vizzuality'
organization.name = attributes[:name] || unique_name('organization')
organization.seats = attributes[:seats] || 10
organization.quota_in_bytes = attributes[:quota_in_bytes] || 100.megabytes
organization.geocoding_quota = attributes[:geocoding_quota] || 1000

@ -22,6 +22,13 @@ class CustomPlan < Zeus::Rails
if ENV['TURBO']
clean_redis_databases
clean_metadata_database
# TODO: This cleanup is necessary due to a bug in TableRelator.table_visualization
RSpec.configure do |config|
config.before(:all) do
Carto::Visualization.where(map_id: nil).each(&:delete)
end
end
else
RSpec.configure do |config|
config.before(:all) do

Loading…
Cancel
Save