camaleon_cms 2.4.5.13 → 2.4.5.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b5b841bdb1ed06f9f3ba65d2cd89e1a7bd9f5e40752d1f4933ff4e2887613be
-  data.tar.gz: e62d7c3127ff0707db4057f3aa6841cc3b1fdaf849cb117a01264ef0e34b237b
+  metadata.gz: fc0ebfaaa321010561d4583a38122cb11c97e98aec6b88d302e697c360485bcb
+  data.tar.gz: e820315d99ea44d5ea52bdb85a07eeeaf224da7cce8e4d350ba8b09120401a50
 SHA512:
-  metadata.gz: 948fabc9666e87b36806fca7fb2241365f011879f902bdb5c54d651c6b38f9c220ea2158d9717ea141d0f516bc37c0e30a5bbf5e148f27a88187969f639cf42c
-  data.tar.gz: 9e1d8973b375de51b6f8ab39d5bbd779372ad828ce29eff92049c852cc9b940492aa1f67552499380f98bac30f7cb54620784125786aaad09b3ae8aa7174a2af
+  metadata.gz: 11eab3a425b657bd240e2cdfa6497257d190dd3fe424c93341b490fab2a8d837afe8fa2ee9f2de4386044e8ef9c66acd2e8a353bce5e94b6eabd92b7bd89e845
+  data.tar.gz: 948f09e2d26e83ef2defb827fb200bda1d284714c56ff6e21c5ac77660b31a3a953252fed523ec7db6aadbb5ac657541b45f1af3c32fcc5d7cae502660ebdea4

data/app/controllers/camaleon_cms/frontend_controller.rb

@@ -176,7 +176,7 @@ class CamaleonCms::FrontendController < CamaleonCms::CamaleonController
       @comments = @post.the_comments
       @categories = @post.the_categories
       @post.increment_visits!
-      
+
       home_page = @_site_options[:home_page] rescue nil
       if lookup_context.template_exists?("page_#{@post.id}")
         r_file = "page_#{@post.id}"
@@ -197,9 +197,9 @@ class CamaleonCms::FrontendController < CamaleonCms::CamaleonController
       layout_ = meta_layout if meta_layout.present? && lookup_context.template_exists?("layouts/#{meta_layout}")
       r = {post: @post, post_type: @post_type, layout: layout_, render: r_file}
       hooks_run("on_render_post", r) if from_url
-      
+
       if status.present?
-        render r[:render], (!r[:layout].nil? ? {layout: r[:layout], status: status} : {status: status})  
+        render r[:render], (!r[:layout].nil? ? {layout: r[:layout], status: status} : {status: status})
       else
         render r[:render], (!r[:layout].nil? ? {layout: r[:layout]} : {})
       end
@@ -209,7 +209,7 @@ class CamaleonCms::FrontendController < CamaleonCms::CamaleonController
 
   # render error page
   def page_not_found()
-    if @_site_options[:error_404].present? # render a custom error page
+    if @_site_options[:error_404].present? && request.format.html? # render a custom error page
       page_404 = current_site.posts.find(@_site_options[:error_404]) rescue ""
       if page_404.present?
         render_post(page_404, false, :not_found)

data/app/helpers/camaleon_cms/session_helper.rb

@@ -124,9 +124,7 @@ module CamaleonCms::SessionHelper
     c = cookies[:auth_token].split("&")
     return nil unless c.size == 3
 
-    if c[1] == request.user_agent.to_s && request.ip == c[2]
-      @cama_current_user = current_site.users_include_admins.find_by_auth_token(c[0]).try(:decorate)
-    end
+    @cama_current_user = current_site.users_include_admins.find_by_auth_token(c[0]).try(:decorate)
   end
 
   # check if a visitor was logged in

data/db/migrate/20180704211100_adjust_field_length.rb

@@ -3,7 +3,7 @@ class AdjustFieldLength < CamaManager.migration_class
     change_column "#{PluginRoutes.static_system_info["db_prefix"]}posts", :title, :text
     remove_index "#{PluginRoutes.static_system_info["db_prefix"]}posts", :slug
     change_column "#{PluginRoutes.static_system_info["db_prefix"]}posts", :slug, :text
-    add_index "#{PluginRoutes.static_system_info["db_prefix"]}posts", :slug, length: 1000
+    add_index "#{PluginRoutes.static_system_info["db_prefix"]}posts", :slug, length: 500
     change_column "#{PluginRoutes.static_system_info["db_prefix"]}term_taxonomy", :name, :text
   end
 end

data/lib/camaleon_cms/version.rb

@@ -1,3 +1,3 @@
 module CamaleonCms
-  VERSION = '2.4.5.13'
+  VERSION = '2.4.5.14'
 end

data/spec/features/admin/session_spec.rb

@@ -80,7 +80,7 @@ describe "the signin process", js: true do
       @site.set_option('security_captcha_user_register', true) # enable captcha security for user registration
       Capybara.using_session("test session") do
         visit cama_captcha_path(len: 4, t: Time.current.to_i)
-        captcha = page.get_rack_session['cama_captcha']
+        captcha = page.get_rack_session['cama_captcha'].first
         visit "#{cama_root_relative_path}/admin/register"
         within("#login_user") do
           fill_in 'user[first_name]', :with => 'Name'
@@ -95,8 +95,8 @@ describe "the signin process", js: true do
         expect(page).to have_css('.alert-success')
       end
     end
-    
+
   end
 
-  
-end
+
+end

data/spec/features/frontend/pages_spec.rb

@@ -7,7 +7,7 @@ describe "Post frontend", js: true do
     visit @post.the_url(as_path: true)
     expect(page).to have_text(@post.the_title)
   end
-  
+
   describe 'comments' do
 
     describe 'anonymous' do
@@ -33,7 +33,7 @@ describe "Post frontend", js: true do
         @site.set_option('enable_captcha_for_comments', true) # enable anonymous captcha
         Capybara.using_session("test session") do
           visit cama_captcha_path(len: 4, t: Time.current.to_i)
-          captcha = page.get_rack_session['cama_captcha']
+          captcha = page.get_rack_session['cama_captcha'].first
           visit @post.the_url(as_path: true)
           expect(page).to have_text('New Comment')
           within("#form-comment") do
@@ -81,36 +81,36 @@ describe "Post frontend", js: true do
       expect(page).not_to have_text('New Comment')
     end
   end
-  
+
   describe 'post visibility' do
     before(:each) do
       current_site(@site)
       plugin_install('visibility_post')
     end
-    
+
     it 'public post' do
       custom_post = create(:post, site: @site).decorate
       visit custom_post.the_url(as_path: true)
-      expect(page).to have_http_status(:success)
+      expect(page).not_to have_text('does not exist')
     end
 
     it 'public future post with login' do
       custom_post = create(:post, site: @site, published_at: 1.day.from_now).decorate
       admin_sign_in(custom_post.owner.username, '12345678')
       visit custom_post.the_url(as_path: true)
-      expect(page).to have_http_status(:not_found)
+      expect(page).to have_text('does not exist')
     end
 
     it 'public future post without login' do
       custom_post = create(:post, site: @site, published_at: 1.day.from_now).decorate
       visit custom_post.the_url(as_path: true)
-      expect(page).to have_http_status(:not_found)
+      expect(page).to have_text('does not exist')
     end
 
     it 'private post without login ' do
       custom_post = create(:private_post, site: @site).decorate
       visit custom_post.the_url(as_path: true)
-      expect(page).to have_http_status(:not_found)
+      expect(page).to have_text('does not exist')
     end
 
     it 'private post with login' do
@@ -118,7 +118,7 @@ describe "Post frontend", js: true do
       custom_post = create(:private_post, site: @site, owner: user).decorate
       admin_sign_in(user.username, '12345678')
       visit custom_post.the_url(as_path: true)
-      expect(page).to have_http_status(:success)
+      expect(page).not_to have_text('does not exist')
     end
 
     it 'password post without password ' do
@@ -130,7 +130,7 @@ describe "Post frontend", js: true do
     it 'password post with password ' do
       custom_post = create(:password_post, site: @site).decorate
       visit custom_post.the_url(as_path: true, post_password: custom_post.visibility_value)
-      expect(page).to have_http_status(:success)
+      expect(page).not_to have_text('does not exist')
     end
   end
-end
+end

data/spec/rails_helper.rb

@@ -1,38 +1,7 @@
 require 'spec_helper'
-require 'transactional_capybara/rspec'
 
-# spec/support/factory_bot.rb
 RSpec.configure do |config|
   config.include FactoryBot::Syntax::Methods
-end
-
-# RSpec without Rails
-RSpec.configure do |config|
-  config.include FactoryBot::Syntax::Methods
-
-  config.before(:suite) do
-    FactoryBot.find_definitions
-  end
-end
-
-# rspec cleaner
-RSpec.configure do |config|
-
-  config.before(:suite) do
-    DatabaseCleaner.strategy = :transaction
-    DatabaseCleaner.clean_with(:truncation)
-  end
-
-  config.around(:each) do |example|
-    DatabaseCleaner.cleaning do
-      example.run
-    end
-  end
-
-end
-
-# capyobara cleaner
-RSpec.configure do |config|
 
   config.use_transactional_fixtures = false
 
@@ -49,6 +18,8 @@ RSpec.configure do |config|
         uncommitted transaction data setup over the spec's database connection.
       MSG
     end
+    FactoryBot.find_definitions
+    DatabaseCleaner.strategy = :transaction
     DatabaseCleaner.clean_with(:truncation)
   end
 
@@ -76,5 +47,4 @@ RSpec.configure do |config|
   config.append_after(:each) do
     DatabaseCleaner.clean
   end
-
-end
+end

data/spec/spec_helper.rb

@@ -11,8 +11,6 @@ require 'rspec/rails'
 require "capybara/rspec"
 require 'database_cleaner'
 require "rack_session_access/capybara"
-
-require 'capybara/rspec'
 require 'capybara-screenshot/rspec'
 
 if defined?(Capybara::Webkit)
@@ -35,7 +33,7 @@ if defined?(Capybara::Webkit)
 
   Capybara.javascript_driver = :webkit
 else
-  Capybara.javascript_driver = :selenium
+  Capybara.javascript_driver = :selenium_chrome_headless
 end
 
 # define screenshot errors name

data/spec/support/common.rb

@@ -64,10 +64,10 @@ end
 
 # fix for: SQLite3::BusyException: database is locked: commit transaction
 def fix_db
-  # if ActiveRecord::Base.connection.adapter_name.downcase.include?('sqlite')
-  #   ActiveRecord::Base.connection.execute("END;")
-  #   ActiveRecord::Base.connection.execute("BEGIN TRANSACTION;")
-  # end
+  if ActiveRecord::Base.connection.adapter_name.downcase.include?('sqlite')
+    ActiveRecord::Base.connection.execute("END;") rescue SQLite3::SQLException
+    # ActiveRecord::Base.connection.execute("BEGIN TRANSACTION;")
+  end
 end
 
 def pages_test
@@ -106,7 +106,7 @@ end
 
 def confirm_dialog
   if page.driver.class.to_s == 'Capybara::Selenium::Driver'
-    page.driver.browser.switch_to.alert.accept
+    page.driver.browser.switch_to.alert.accept rescue Selenium::WebDriver::Error::NoAlertPresentError
   elsif page.driver.class.to_s == 'Capybara::Webkit::Driver'
     sleep 1 # prevent test from failing by waiting for popup
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camaleon_cms
 version: !ruby/object:Gem::Version
-  version: 2.4.5.13
+  version: 2.4.5.14
 platform: ruby
 authors:
 - Owen Peredo Diaz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-11 00:00:00.000000000 Z
+date: 2019-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt