From 8b8c998f1af31c607f665b7d9cd4916930bde49d Mon Sep 17 00:00:00 2001
From: "Karl O. Pinc" <kop@karlpinc.com>
Date: Sat, 23 Jan 2021 14:25:20 -0600
Subject: [PATCH] Have literal_column_headings values be those of
 boolean_choice

---
 src/pgwui_upload/pgwui_upload.py |  2 +-
 tests/views/test_upload.py       | 31 +------------------------------
 2 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/src/pgwui_upload/pgwui_upload.py b/src/pgwui_upload/pgwui_upload.py
index c7d0a7a..1521ccf 100644
--- a/src/pgwui_upload/pgwui_upload.py
+++ b/src/pgwui_upload/pgwui_upload.py
@@ -24,7 +24,7 @@
 PGWUI_COMPONENT = 'pgwui_upload'
 DEFAULT_UPLOAD_ROUTE = '/upload'
 DEFAULT_UPLOAD_MENU_LABEL = 'upload -- Upload File Into Database'
-DEFAULT_LITERAL_COLUMN_HEADINGS = 'off'
+DEFAULT_LITERAL_COLUMN_HEADINGS = 'no-never'
 DEFAULT_TRIM = 'choice-yes'
 
 
diff --git a/tests/views/test_upload.py b/tests/views/test_upload.py
index 6798c4a..14ce5fc 100644
--- a/tests/views/test_upload.py
+++ b/tests/views/test_upload.py
@@ -24,7 +24,7 @@ import logging
 import pytest
 from pgwui_testing import testing
 from pyramid.testing import DummyRequest
-from pyramid.threadlocal import get_current_request, get_current_registry
+from pyramid.threadlocal import get_current_request
 from pgwui_common.__init__ import includeme as pgwui_common_includeme
 from pgwui_core import constants
 from pgwui_upload.__init__ import includeme as pgwui_upload_includeme
@@ -191,32 +191,3 @@ def test_upload_view_db_changed(undecorate, mock_log_success):
 
     assert result == response
     assert mock_log_success.call_count == 1
-
-
-def test_upload_view_literal_cols_ask(undecorate, mock_log_success):
-    '''When literal_column_headings == ask the respose should reflect this'''
-
-    response = UNCHANGED_RESPONSE
-    undecorate(response)
-
-    settings = get_current_request().registry.settings
-    settings['pgwui']['pgwui_upload'].update(
-        {'literal_column_headings': 'ask'})
-
-    result = upload.upload_view(get_current_request())
-
-    assert result['ask_about_literal_cols']
-
-
-def test_upload_view_literal_cols_noask(undecorate, mock_log_success):
-    '''When literal_column_headings != ask the respose should reflect this'''
-
-    response = UNCHANGED_RESPONSE
-    undecorate(response)
-
-    settings = get_current_registry().settings
-    settings['pgwui']['pgwui_upload'].update({'literal_column_headings': 'no'})
-
-    result = upload.upload_view(get_current_request())
-
-    assert not(result['ask_about_literal_cols'])
-- 
2.34.1