[db] Remove TestCaseText model, merge into TestCase.text field

- TestCaseText model is removed and provided as TestCase.text field - TestCase.latest_text() is removed in favor of TestCase.text - TestCase.latest_text_version() is removed in favor of TestCase.history.latest().history_id - TestCase.get_text_with_version() will read from the history - TestCase.add_text() is removed - TestCase.get_text_versions() - removed - TestCaseRun.latest_text() is removed - TestCaseRun.get_text_with_version() is removed in favor of TestCase.get_text_with_version() - NoneText is removed - tcms.core.utils.checksum is removed - tcms.utils.dict_utils is removed - update existing templates and forms - update test suite to generate historical records Closes #198
kiwitcms · Jan 20, 2019 · c87e751 · c87e751
1 parent 571d6f2
commit c87e751
Show file tree

Hide file tree

Showing 31 changed files with 166 additions and 592 deletions.
diff --git a/docs/source/modules/tcms.core.utils.rst b/docs/source/modules/tcms.core.utils.rst
@@ -11,7 +11,6 @@ Submodules
 
 .. toctree::
 
-   tcms.core.utils.checksum
    tcms.core.utils.mailto
    tcms.core.utils.validations
 
diff --git a/docs/source/modules/tcms.utils.dict_utils.rst b/docs/source/modules/tcms.utils.dict_utils.rst
diff --git a/docs/source/modules/tcms.utils.rst b/docs/source/modules/tcms.utils.rst
@@ -11,6 +11,5 @@ Submodules
 
 .. toctree::
 
-   tcms.utils.dict_utils
    tcms.utils.permissions
 
diff --git a/tcms/core/utils/checksum.py b/tcms/core/utils/checksum.py
diff --git a/tcms/issuetracker/types.py b/tcms/issuetracker/types.py
@@ -155,19 +155,14 @@ def report_issue_from_testcase(self, caserun):
         args = {}
         args['cf_build_id'] = caserun.run.build.name
 
-        # this is a TestCaseText model or NoneText
-        txt = caserun.get_text_with_version(case_text_version=caserun.case_text_version)
-        setup = txt.setup
-        action = txt.action
-        effect = txt.effect
+        txt = caserun.case.get_text_with_version(case_text_version=caserun.case_text_version)
 
         comment = "Filed from caserun %s\n\n" % caserun.get_full_url()
         comment += "Version-Release number of selected " \
                    "component (if applicable):\n"
         comment += '%s\n\n' % caserun.build.name
-        comment += "Steps to Reproduce: \n%s\n%s\n\n" % (setup, action)
+        comment += "Steps to Reproduce: \n%s\n\n" % txt
         comment += "Actual results: \n<describe what happened>\n\n"
-        comment += "Expected results:\n%s\n\n" % effect
 
         args['comment'] = comment
         args['component'] = caserun.case.component.values_list('name',
@@ -256,21 +251,17 @@ def report_issue_from_testcase(self, caserun):
             args['reporter'] = self.rpc.user(tested_by.username).key
         except jira.JIRAError:
             pass
-        # this is a TestCaseText model or NoneText
-        txt = caserun.get_text_with_version(case_text_version=caserun.case_text_version)
-        setup = txt.setup
-        action = txt.action
-        effect = txt.effect
+
+        txt = caserun.case.get_text_with_version(case_text_version=caserun.case_text_version)
 
         comment = "Filed from caserun %s\n\n" % caserun.get_full_url()
         comment += "Product:\n%s\n\n" % caserun.run.plan.product.name
         comment += "Component(s):\n%s\n\n" % caserun.case.component.values_list('name', flat=True)
         comment += "Version-Release number of selected " \
                    "component (if applicable):\n"
         comment += "%s\n\n" % caserun.build.name
-        comment += "Steps to Reproduce: \n%s\n%s\n\n" % (setup, action)
+        comment += "Steps to Reproduce: \n%s\n\n" % txt
         comment += "Actual results: \n<describe what happened>\n\n"
-        comment += "Expected results:\n%s\n\n" % effect
         args['description'] = comment
 
         url = self.tracker.base_url
@@ -321,21 +312,16 @@ def report_issue_from_testcase(self, caserun):
             'title': 'Failed test: %s' % caserun.case.summary,
         }
 
-        # this is a TestCaseText model or NoneText
-        txt = caserun.get_text_with_version(case_text_version=caserun.case_text_version)
-        setup = txt.setup
-        action = txt.action
-        effect = txt.effect
+        txt = caserun.case.get_text_with_version(case_text_version=caserun.case_text_version)
 
         comment = "Filed from caserun %s\n\n" % caserun.get_full_url()
         comment += "Product:\n%s\n\n" % caserun.run.plan.product.name
         comment += "Component(s):\n%s\n\n" % caserun.case.component.values_list('name', flat=True)
         comment += "Version-Release number of selected " \
                    "component (if applicable):\n"
         comment += "%s\n\n" % caserun.build.name
-        comment += "Steps to Reproduce: \n%s\n%s\n\n" % (setup, action)
+        comment += "Steps to Reproduce: \n%s\n\n" % txt
         comment += "Actual results: \n<describe what happened>\n\n"
-        comment += "Expected results:\n%s\n\n" % effect
         args['body'] = comment
 
         url = self.tracker.base_url
@@ -371,11 +357,7 @@ def report_issue_from_testcase(self, caserun):
             'issue[title]': 'Failed test: %s' % caserun.case.summary,
         }
 
-        # this is a TestCaseText model or NoneText
-        txt = caserun.get_text_with_version(case_text_version=caserun.case_text_version)
-        setup = txt.setup
-        action = txt.action
-        effect = txt.effect
+        txt = caserun.case.get_text_with_version(case_text_version=caserun.case_text_version)
 
         comment = "Filed from caserun %s\n\n" % caserun.get_full_url()
         comment += "**Product**:\n%s\n\n" % caserun.run.plan.product.name
@@ -384,9 +366,8 @@ def report_issue_from_testcase(self, caserun):
         comment += "Version-Release number of selected " \
                    "component (if applicable):\n"
         comment += "%s\n\n" % caserun.build.name
-        comment += "**Steps to Reproduce**: \n%s\n%s\n\n" % (setup, action)
+        comment += "**Steps to Reproduce**: \n%s\n\n" % txt
         comment += "**Actual results**: \n<describe what happened>\n\n"
-        comment += "**Expected results**:\n%s\n\n" % effect
         args['issue[description]'] = comment
 
         url = self.tracker.base_url

diff --git a/tcms/templates/case/edit.html b/tcms/templates/case/edit.html
@@ -46,13 +46,6 @@
 
 {% block contents %}
 <div id="content">
-	<span class="right-action">
-            {% if test_case %}
-		<a href="{% url "testcases-text_history" test_case.case_id %}?from_plan={{ test_plan.plan_id }}" class="historylink">
-			Edit History
-		</a>
-            {% endif %}
-	</span>
     {% if test_case %}
         <form action="{% url "testcases-edit" test_case.case_id %}" method="post">
     {% else %}
@@ -113,24 +106,10 @@
                                                 {% endif %}
                                             </div>
 					</div>
-					<div class="data_row">
-                                            <label >Last Editor</label>
-                                            <div id="display_editor">
-                                                {% if test_case.latest_text.author %}
-                                                <a href="{% url "tcms-profile" test_case.latest_text.author.username %}">
-                                                   {{ test_case.latest_text.author.username }}
-                                                </a>
-                                                {% endif %}
-                                            </div>
-					</div>
 					<div class="data_row">
 						<label >Created</label>
 						<div class="name">{{ test_case.create_date }}</div>
 					</div>
-					<div class="data_row">
-						<label >Last Modified</label>
-						<div id="display_modify_date" >{{ test_case.latest_text.create_date }}</div>
-					</div>
                                     {% endif %}
 
 					<div class="data_row">
@@ -157,15 +136,7 @@
 			<fieldset class="no-border background-light-grey">
 				<div class="editor-side">
 					<h4 class="strong">Setup</h4>
-					<div class="form" id="form_setup">{{ form.setup }}</div>
-					<h4 class="strong">Actions</h4>
-					<div class="form" id="form_action">{{ form.action }}</div>
-				</div>
-				<div class="editor-side">
-					<h4 class="strong">Break down</h4>
-					<div class="" id="form_breakdown">{{ form.breakdown }}</div>
-					<h4 class="strong">Expected Results</h4>
-					<div class="" id="form_effect">{{ form.effect }}</div>
+					<div class="form" id="form_text">{{ form.text }}</div>
 				</div>
 			</fieldset>
                     {% if notify_form %}

diff --git a/tcms/templates/case/get_details.html b/tcms/templates/case/get_details.html
@@ -3,13 +3,9 @@
 <td id="id_case_text_{{ forloop.counter }}" colspan="12">
 	<table class="case_detail">
 		<tr>
-			<td valign="top">
-				<h4>Setup:</h4>
-				<div class="content">{{ test_case_text.setup|markdown2html }}</div>
-			</td>
-			<td class="" valign="top">
-				<h4>Breakdown:</h4>
-				<div class="content">{{ test_case_text.breakdown|markdown2html }}</div>
+			<td valign="top" colspan='2'>
+				<h4>Text:</h4>
+				<div class="content">{{ test_case.text|markdown2html }}</div>
 			</td>
 			<td valign="top" rowspan="2" width="200">
 				<h4><span class="title strong">Attachment:</span></h4>
@@ -56,16 +52,6 @@ <h4><span class="title strong">bug:</span></h4>
 				</ul>
 			</td>
 		</tr>
-		<tr>
-			<td class="" valign="top">
-				<h4>Actions:</h4>
-				<div class="content">{{ test_case_text.action|markdown2html }}</div>
-			</td>
-			<td class="" valign="top">
-				<h4>Expected Results:</h4>
-				<div class="content">{{ test_case_text.effect|markdown2html }}</div>
-			</td>
-		</tr>
 		<tr>
 			<td colspan='3'>
 				<h4>Notes:</h4>

diff --git a/tcms/templates/case/get_details_case_run.html b/tcms/templates/case/get_details_case_run.html
@@ -129,33 +129,10 @@ <h4 class="borderB">Change Log</h4>
 		<div class="caseInfo">
 			<table cellpadding="0" cellspacing="0" border="0" width="100%">
 				<tr>
-					<td>
+					<td colspan='3'>
 						<div class="container">
-							<h4>Setup</h4>
-							<div class="content">{{ test_case_text.setup|markdown2html }}</div>
-						</div>
-					</td>
-					<td style="width:5px;"></td>
-					<td>
-						<div class="container">
-							<h4>Breakdown</h4>
-							<div class="content">{{ test_case_text.breakdown|markdown2html }}</div>
-						</div>
-					</td>
-				</tr>
-				<tr>
-					<td>
-						<div class="container">
-							<h4>Actions</h4>
-							<div class="content">{{ test_case_text.action|markdown2html }}</div>
-						</div>
-
-					</td>
-					<td style="width:5px;"></td>
-					<td>
-						<div class="container">
-							<h4>Expected Results</h4>
-							<div class="content">{{ test_case_text.effect|markdown2html }}</div>
+							<h4>Text</h4>
+							<div class="content">{{ test_case_text|markdown2html }}</div>
 						</div>
 					</td>
 				</tr>

diff --git a/tcms/templates/case/history.html b/tcms/templates/case/history.html
diff --git a/tcms/templates/case/printable.html b/tcms/templates/case/printable.html
@@ -47,28 +47,13 @@ <h2 id="plan_document">Test Plan Document</h2>
     <div>
         <h2 id="plan_cases">Test Cases</h2>
         <div class="thick-line"></div>
-	{% for case_id, test_cases in test_cases.items %}
+	{% for test_case in test_cases %}
         <div style="clear: left">
-            {% for test_case in test_cases %}
-		<h3>TC-{{ test_case.case_id }}: {{ test_case.case__summary }}</h3>
+		<h3>TC-{{ test_case.case_id }}: {{ test_case.summary }}</h3>
 		<div class="thin-line"></div>
 		<div class="case-stage">
-			<h4>Set up</h4>
-			{{ test_case.setup|markdown2html }}
+			{{ test_case.text|markdown2html }}
 		</div>
-		<div class="case-stage">
-			<h4>Actions</h4>
-			{{ test_case.action|markdown2html }}
-		</div>
-		<div class="case-stage">
-			<h4>Expected Results</h4>
-			{{ test_case.effect|markdown2html }}
-		</div>
-		<div class="case-stage">
-			<h4>Breakdown</h4>
-			{{ test_case.breakdown|markdown2html }}
-		</div>
-            {% endfor %}
 	</div>
 	{% endfor %}
     </div>

diff --git a/tcms/testcases/forms.py b/tcms/testcases/forms.py
@@ -105,10 +105,7 @@ class BaseCaseForm(forms.Form):
         widget=forms.Textarea,
         required=False
     )
-    setup = forms.CharField(label="Setup", widget=SimpleMDE(), required=False)
-    action = forms.CharField(label="Actions", widget=SimpleMDE(), required=False)
-    effect = forms.CharField(label="Expect results", widget=SimpleMDE(), required=False)
-    breakdown = forms.CharField(label="Breakdown", widget=SimpleMDE(), required=False)
+    text = forms.CharField(widget=SimpleMDE(), required=False)
 
     def __init__(self, *args, **kwargs):
         if args:
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,6 +11,5 @@ Submodules

		.. toctree::

		tcms.utils.dict_utils
		tcms.utils.permissions