qor5 · zhangshanwen · May 22, 2025 · Nov 12, 2024 · Nov 14, 2024 · Nov 15, 2024
diff --git a/autocomplete/integration/autocomplete_test.go b/autocomplete/integration/autocomplete_test.go
@@ -88,7 +88,7 @@ func TestCategory(t *testing.T) {
 		err      error
 		response autocomplete.Response
 	)
-	bytes := runTest(t, httptest.NewRequest("GET", "/complete/categories", nil), handler)
+	bytes := runTest(t, httptest.NewRequest("GET", "/complete/categories", http.NoBody), handler)
 	if err = json.Unmarshal(bytes.Bytes(), &response); err != nil {
 		t.Fatalf("json unmarshal faield :%v", err)
 		return
@@ -114,7 +114,7 @@ func TestUser(t *testing.T) {
 		response autocomplete.Response
 	)
 
-	bytes := runTest(t, httptest.NewRequest("GET", "/complete/users", nil), handler)
+	bytes := runTest(t, httptest.NewRequest("GET", "/complete/users", http.NoBody), handler)
 	if err = json.Unmarshal(bytes.Bytes(), &response); err != nil {
 		t.Fatalf("json unmarshal faield :%v", err)
 		return
@@ -140,7 +140,7 @@ func TestUserSearch(t *testing.T) {
 		response autocomplete.Response
 	)
 
-	bytes := runTest(t, httptest.NewRequest("GET", "/complete/users?search=k", nil), handler)
+	bytes := runTest(t, httptest.NewRequest("GET", "/complete/users?search=k", http.NoBody), handler)
 	if err = json.Unmarshal(bytes.Bytes(), &response); err != nil {
 		t.Fatalf("json unmarshal faield :%v", err)
 		return
@@ -166,7 +166,7 @@ func TestCategoryPage(t *testing.T) {
 		response autocomplete.Response
 	)
 
-	bytes := runTest(t, httptest.NewRequest("GET", "/complete/categories?page=2&pageSize=3", nil), handler)
+	bytes := runTest(t, httptest.NewRequest("GET", "/complete/categories?page=2&pageSize=3", http.NoBody), handler)
 	if err = json.Unmarshal(bytes.Bytes(), &response); err != nil {
 		t.Fatalf("json unmarshal faield :%v", err)
 		return

diff --git a/cmd/qor5/website-template/admin/integration_test.go b/cmd/qor5/website-template/admin/integration_test.go
@@ -52,7 +52,7 @@ func TestAll(t *testing.T) {
 			Debug: true,
 			ReqFunc: func() *http.Request {
 				data.TruncatePut(SqlDB)
-				return httptest.NewRequest("GET", "/admin/pages", nil)
+				return httptest.NewRequest("GET", "/admin/pages", http.NoBody)
 			},
 			ExpectPageBodyContainsInOrder: []string{"My first page"},
 		},
@@ -85,7 +85,7 @@ func TestAll(t *testing.T) {
 			ReqFunc: func() *http.Request {
 				data.TruncatePut(SqlDB)
 				req := multipartestutils.NewMultipartBuilder().
-					PageURL("/admin/page_builder/my-headers?__execute_event__=presets_Update&id=1").
+					PageURL("/admin/my-headers?__execute_event__=presets_Update&id=1").
 					AddField("MenuItems[0].Text", "123").
 					AddField("MenuItems[0].Link", "123").
 					AddField("MenuItems[1].Text", "456").

diff --git a/docs/docsrc/examples/examples_admin/activity_test.go b/docs/docsrc/examples/examples_admin/activity_test.go
@@ -71,7 +71,7 @@ func TestActivity(t *testing.T) {
 			Debug: true,
 			ReqFunc: func() *http.Request {
 				activityData.TruncatePut(dbr)
-				return httptest.NewRequest("GET", "/with-activity-products", nil)
+				return httptest.NewRequest("GET", "/with-activity-products", http.NoBody)
 			},
 			ExpectPageBodyContainsInOrder: []string{"Under Armour Curry 7", "Asics Gel Lyte III", "Air Jordan 4 RM Prowls", "<v-badge", ">1</div>", "</v-badge>"},
 		},
@@ -555,7 +555,7 @@ func TestActivityAdmin(t *testing.T) {
 			Debug: true,
 			ReqFunc: func() *http.Request {
 				activityData.TruncatePut(dbr)
-				return httptest.NewRequest("GET", "/activity-logs?lang=zh&per_page=10", nil)
+				return httptest.NewRequest("GET", "/activity-logs?lang=zh&per_page=10", http.NoBody)
 			},
 			ExpectPageBodyContainsInOrder: []string{
 				"操作日志列表",
@@ -571,7 +571,7 @@ func TestActivityAdmin(t *testing.T) {
 			Debug: true,
 			ReqFunc: func() *http.Request {
 				// activityData.TruncatePut(dbr)
-				return httptest.NewRequest("GET", "/activity-logs?lang=zh&after=eyJJRCI6Mzd9&per_page=10", nil)
+				return httptest.NewRequest("GET", "/activity-logs?lang=zh&after=eyJJRCI6Mzd9&per_page=10", http.NoBody)
 			},
 			ExpectPageBodyContainsInOrder: []string{
 				"操作日志列表",
@@ -587,7 +587,7 @@ func TestActivityAdmin(t *testing.T) {
 			Debug: true,
 			ReqFunc: func() *http.Request {
 				// activityData.TruncatePut(dbr)
-				return httptest.NewRequest("GET", "/activity-logs?lang=zh&before=eyJJRCI6MzZ9&per_page=10", nil)
+				return httptest.NewRequest("GET", "/activity-logs?lang=zh&before=eyJJRCI6MzZ9&per_page=10", http.NoBody)
 			},
 			ExpectPageBodyContainsInOrder: []string{
 				"操作日志列表",
@@ -632,7 +632,7 @@ func TestActivityAdmin(t *testing.T) {
 			Debug: true,
 			ReqFunc: func() *http.Request {
 				// activityData.TruncatePut(dbr)
-				return httptest.NewRequest("GET", "/activity-logs?lang=zh&before=eyJJRCI6MzZ9&per_page=10", nil)
+				return httptest.NewRequest("GET", "/activity-logs?lang=zh&before=eyJJRCI6MzZ9&per_page=10", http.NoBody)
 			},
 			ExpectPageBodyContainsInOrder: []string{
 				"操作日志列表",
@@ -648,7 +648,7 @@ func TestActivityAdmin(t *testing.T) {
 			Debug: true,
 			ReqFunc: func() *http.Request {
 				// activityData.TruncatePut(dbr)
-				return httptest.NewRequest("GET", "/activity-logs?lang=zh&before=eyJJRCI6MTIzfQ&per_page=10", nil)
+				return httptest.NewRequest("GET", "/activity-logs?lang=zh&before=eyJJRCI6MTIzfQ&per_page=10", http.NoBody)
 			},
 			ExpectPageBodyContainsInOrder: []string{
 				"操作日志列表",
@@ -757,7 +757,7 @@ func TestActivityAdmin(t *testing.T) {
 			},
 			ReqFunc: func() *http.Request {
 				// activityData.TruncatePut(dbr)
-				return httptest.NewRequest("GET", "/activity-logs?lang=zh", nil)
+				return httptest.NewRequest("GET", "/activity-logs?lang=zh", http.NoBody)
 			},
 			ExpectPageBodyContainsInOrder: []string{
 				"没有可显示的记录",
@@ -783,7 +783,7 @@ func TestActivityAdmin(t *testing.T) {
 			},
 			ReqFunc: func() *http.Request {
 				// activityData.TruncatePut(dbr)
-				return httptest.NewRequest("GET", "/activity-logs?lang=zh", nil)
+				return httptest.NewRequest("GET", "/activity-logs?lang=zh", http.NoBody)
 			},
 			ExpectPageBodyNotContains: []string{
 				"没有可显示的记录",
@@ -893,7 +893,7 @@ func TestActivityBeforeCreate(t *testing.T) {
 			Name:  "Index Page",
 			Debug: true,
 			ReqFunc: func() *http.Request {
-				return httptest.NewRequest("GET", "/activity-logs?lang=zh", nil)
+				return httptest.NewRequest("GET", "/activity-logs?lang=zh", http.NoBody)
 			},
 			ExpectPageBodyContainsInOrder: []string{
 				"操作日志列表",

diff --git a/docs/docsrc/examples/examples_admin/autocomplete_test.go b/docs/docsrc/examples/examples_admin/autocomplete_test.go
@@ -34,7 +34,7 @@ func TestAutoComplete(t *testing.T) {
 			Debug: true,
 			ReqFunc: func() *http.Request {
 				autocompleteData.TruncatePut(dbr)
-				return httptest.NewRequest("GET", "/auto-complete-posts", nil)
+				return httptest.NewRequest("GET", "/auto-complete-posts", http.NoBody)
 			},
 			ExpectPageBodyContainsInOrder: []string{"test.title", "test.body"},
 		},
@@ -43,7 +43,7 @@ func TestAutoComplete(t *testing.T) {
 			Debug: true,
 			ReqFunc: func() *http.Request {
 				autocompleteData.TruncatePut(dbr)
-				return httptest.NewRequest("GET", "/auto-complete-posts?f_title=test.title__2", nil)
+				return httptest.NewRequest("GET", "/auto-complete-posts?f_title=test.title__2", http.NoBody)
 			},
 			ExpectPageBodyContainsInOrder: []string{"test.title"},
 			ExpectPageBodyNotContains:     []string{"test.body"},

diff --git a/docs/docsrc/examples/examples_admin/autosync_test.go b/docs/docsrc/examples/examples_admin/autosync_test.go
@@ -35,7 +35,7 @@ func TestAutoSyncFrom(t *testing.T) {
 				})
 			},
 			ReqFunc: func() *http.Request {
-				return httptest.NewRequest("GET", "/with-slug-products?__execute_event__=presets_New", nil)
+				return httptest.NewRequest("GET", "/with-slug-products?__execute_event__=presets_New", http.NoBody)
 			},
 			ExpectPortalUpdate0ContainsInOrder: []string{"Title", "Title Slug", `form["TitleSlug__AutoSync__"] = (plaid().slug(form["Title"]||"")) === form["TitleSlug"]`, "Auto Sync"},
 		},
@@ -49,7 +49,7 @@ func TestAutoSyncFrom(t *testing.T) {
 				})
 			},
 			ReqFunc: func() *http.Request {
-				return httptest.NewRequest("GET", "/with-slug-products?__execute_event__=presets_New", nil)
+				return httptest.NewRequest("GET", "/with-slug-products?__execute_event__=presets_New", http.NoBody)
 			},
 			ExpectPortalUpdate0ContainsInOrder: []string{"Title", "Title Slug", `form["TitleSlug__AutoSync__"] = false`, "Auto Sync"},
 		},
@@ -63,7 +63,7 @@ func TestAutoSyncFrom(t *testing.T) {
 				})
 			},
 			ReqFunc: func() *http.Request {
-				return httptest.NewRequest("GET", "/with-slug-products?__execute_event__=presets_New", nil)
+				return httptest.NewRequest("GET", "/with-slug-products?__execute_event__=presets_New", http.NoBody)
 			},
 			ExpectPortalUpdate0ContainsInOrder: []string{"Title", "Title Slug", `form["TitleSlug__AutoSync__"] = true`, "Auto Sync"},
 		},

diff --git a/docs/docsrc/examples/examples_admin/linkage_select_filter_item_remote_test.go b/docs/docsrc/examples/examples_admin/linkage_select_filter_item_remote_test.go
@@ -31,7 +31,7 @@ func TestLinkageSelectFilter(t *testing.T) {
 			Debug: true,
 			ReqFunc: func() *http.Request {
 				linkageSelectFilterData.TruncatePut(dbr)
-				return httptest.NewRequest("GET", "/addresses", nil)
+				return httptest.NewRequest("GET", "/addresses", http.NoBody)
 			},
 			ExpectPageBodyContainsInOrder: []string{"西湖区", "拱墅区"},
 		},
@@ -77,7 +77,7 @@ func TestLinkageSelectFilter(t *testing.T) {
 			Debug: true,
 			ReqFunc: func() *http.Request {
 				linkageSelectFilterData.TruncatePut(dbr)
-				return httptest.NewRequest("GET", "/addresses?f_province_city_district=浙江__1,杭州__3,拱墅区__7", nil)
+				return httptest.NewRequest("GET", "/addresses?f_province_city_district=浙江__1,杭州__3,拱墅区__7", http.NoBody)
 			},
 			ExpectPageBodyContainsInOrder: []string{"拱墅区"},
 			ExpectPageBodyNotContains:     []string{"西湖区"},

diff --git a/docs/docsrc/examples/examples_admin/listing_test.go b/docs/docsrc/examples/examples_admin/listing_test.go
@@ -54,7 +54,7 @@ func TestListingExample(t *testing.T) {
 			},
 			ReqFunc: func() *http.Request {
 				dataEmptyForListing.TruncatePut(dbr)
-				return httptest.NewRequest("GET", "/posts", nil)
+				return httptest.NewRequest("GET", "/posts", http.NoBody)
 			},
 			ExpectPageBodyContainsInOrder: []string{"No records to show"},
 		},
@@ -67,7 +67,7 @@ func TestListingExample(t *testing.T) {
 			},
 			ReqFunc: func() *http.Request {
 				dataSeedForListing.TruncatePut(dbr)
-				return httptest.NewRequest("GET", "/posts", nil)
+				return httptest.NewRequest("GET", "/posts", http.NoBody)
 			},
 			ExpectPageBodyNotContains:     []string{"No records to show"},
 			ExpectPageBodyContainsInOrder: []string{"v-pagination", ":total-visible='5'"},
@@ -87,7 +87,7 @@ func TestListingExample(t *testing.T) {
 			},
 			ReqFunc: func() *http.Request {
 				dataSeedForListing.TruncatePut(dbr)
-				return httptest.NewRequest("GET", "/posts", nil)
+				return httptest.NewRequest("GET", "/posts", http.NoBody)
 			},
 			ExpectPageBodyContainsInOrder: []string{"ActionExample"},
 		},
@@ -374,7 +374,7 @@ func TestListingExample(t *testing.T) {
 			},
 			ReqFunc: func() *http.Request {
 				dataSeedForListing.TruncatePut(dbr)
-				return httptest.NewRequest("GET", "/posts", nil)
+				return httptest.NewRequest("GET", "/posts", http.NoBody)
 			},
 			ExpectPageBodyContainsInOrder: []string{"BulkActionExample"},
 		},
@@ -677,7 +677,7 @@ func TestListingWithJoinsExample(t *testing.T) {
 			},
 			ReqFunc: func() *http.Request {
 				dataEmptyForListing.TruncatePut(dbr)
-				return httptest.NewRequest("GET", "/post-with-categories", nil)
+				return httptest.NewRequest("GET", "/post-with-categories", http.NoBody)
 			},
 			ExpectPageBodyContainsInOrder: []string{"No records to show"},
 		},
@@ -690,7 +690,7 @@ func TestListingWithJoinsExample(t *testing.T) {
 			},
 			ReqFunc: func() *http.Request {
 				dataSeedForListing.TruncatePut(dbr)
-				return httptest.NewRequest("GET", "/post-with-categories", nil)
+				return httptest.NewRequest("GET", "/post-with-categories", http.NoBody)
 			},
 			ExpectPageBodyNotContains:     []string{"No records to show"},
 			ExpectPageBodyContainsInOrder: []string{"mdi-chevron-left", "mdi-chevron-right"},

diff --git a/docs/docsrc/examples/examples_admin/localization_test.go b/docs/docsrc/examples/examples_admin/localization_test.go
@@ -38,7 +38,7 @@ func TestLocalization(t *testing.T) {
 			Debug: true,
 			ReqFunc: func() *http.Request {
 				l10nData.TruncatePut(SqlDB)
-				return httptest.NewRequest("GET", "/l10n-models", nil)
+				return httptest.NewRequest("GET", "/l10n-models", http.NoBody)
 			},
 			ExpectPageBodyContainsInOrder: []string{"My model title", "International"},
 		},
@@ -47,7 +47,7 @@ func TestLocalization(t *testing.T) {
 			Debug: true,
 			ReqFunc: func() *http.Request {
 				l10nDataWithChina.TruncatePut(SqlDB)
-				return httptest.NewRequest("GET", "/l10n-models?locale=China", nil)
+				return httptest.NewRequest("GET", "/l10n-models?locale=China", http.NoBody)
 			},
 			ExpectPageBodyContainsInOrder: []string{"中文标题"},
 		},

diff --git a/docs/docsrc/examples/examples_admin/login_test.go b/docs/docsrc/examples/examples_admin/login_test.go
@@ -29,15 +29,15 @@ func TestChangePassword(t *testing.T) {
 			Name:  "index",
 			Debug: true,
 			ReqFunc: func() *http.Request {
-				return httptest.NewRequest("GET", "/", nil)
+				return httptest.NewRequest("GET", "/", http.NoBody)
 			},
 			ExpectPageBodyContainsInOrder: []string{"Change Password"},
 		},
 		{
 			Name:  "show dialog",
 			Debug: true,
 			ReqFunc: func() *http.Request {
-				return httptest.NewRequest("GET", "/?__execute_event__=login_openChangePasswordDialog", nil)
+				return httptest.NewRequest("GET", "/?__execute_event__=login_openChangePasswordDialog", http.NoBody)
 			},
 			ExpectPortalUpdate0ContainsInOrder: []string{"Change your password"},
 		},
@@ -113,7 +113,7 @@ func TestPasswordWithVisibleToggle(t *testing.T) {
 			Name:  "password field with visible toggle",
 			Debug: true,
 			ReqFunc: func() *http.Request {
-				return httptest.NewRequest("GET", "/auth/login", nil)
+				return httptest.NewRequest("GET", "/auth/login", http.NoBody)
 			},
 			ExpectPageBodyContainsInOrder: []string{`:password-visible-toggle='true'`},
 		},