fix test

Author: phm07

internal/cmd/storagebox/create_test.go

@@ -143,7 +143,7 @@ func TestCreateJSON(t *testing.T) {
 		},
 		Server: hcloud.Ptr("u1337.your-storagebox.de"),
 		System: hcloud.Ptr("FSN1-BX355"),
-		Stats: &hcloud.StorageBoxStats{
+		Stats: hcloud.StorageBoxStats{
 			Size:          0,
 			SizeData:      0,
 			SizeSnapshots: 0,

internal/cmd/storagebox/describe_test.go

@@ -80,7 +80,7 @@ func TestDescribe(t *testing.T) {
 		},
 		Server: hcloud.Ptr("u1337.your-storagebox.de"),
 		System: hcloud.Ptr("FSN1-BX355"),
-		Stats: &hcloud.StorageBoxStats{
+		Stats: hcloud.StorageBoxStats{
 			Size:          0,
 			SizeData:      0,
 			SizeSnapshots: 0,

internal/cmd/storagebox/list_test.go

@@ -33,7 +33,7 @@ func TestList(t *testing.T) {
 		StorageBoxType: &hcloud.StorageBoxType{
 			Name: "bx11",
 		},
-		Stats: &hcloud.StorageBoxStats{
+		Stats: hcloud.StorageBoxStats{
 			Size: 42 * util.Gibibyte,
 		},
 		Labels: map[string]string{
@@ -59,6 +59,7 @@ func TestList(t *testing.T) {
 		AllWithOpts(
 			gomock.Any(),
 			hcloud.StorageBoxListOpts{
+				Sort:     []string{"id:asc"},
 				ListOpts: hcloud.ListOpts{PerPage: 50},
 			},
 		).

internal/cmd/storagebox/snapshot/list_test.go

@@ -53,7 +53,7 @@ func TestList(t *testing.T) {
 		AllSnapshotsWithOpts(
 			gomock.Any(),
 			sb,
-			hcloud.StorageBoxSnapshotListOpts{},
+			hcloud.StorageBoxSnapshotListOpts{Sort: []string{"id:asc"}},
 		).
 		Return([]*hcloud.StorageBoxSnapshot{
 			sbs,

internal/cmd/storagebox/subaccount/change_home_directory_test.go

@@ -26,7 +26,7 @@ func TestChangeHomeDirectory(t *testing.T) {
 		Get(gomock.Any(), "my-storage-box").
 		Return(sb, nil, nil)
 	fx.Client.StorageBoxClient.EXPECT().
-		GetSubaccountByID(gomock.Any(), sb, int64(456)).
+		GetSubaccount(gomock.Any(), sb, "456").
 		Return(sbs, nil, nil)
 	fx.Client.StorageBoxClient.EXPECT().
 		ChangeSubaccountHomeDirectory(gomock.Any(), sbs, hcloud.StorageBoxSubaccountChangeHomeDirectoryOpts{

internal/cmd/storagebox/subaccount/delete_test.go

@@ -33,7 +33,7 @@ func TestDelete(t *testing.T) {
 		Get(gomock.Any(), "my-storage-box").
 		Return(sb, nil, nil)
 	fx.Client.StorageBoxClient.EXPECT().
-		GetSubaccountByID(gomock.Any(), sb, int64(456)).
+		GetSubaccount(gomock.Any(), sb, "456").
 		Return(sbs, nil, nil)
 	fx.Client.StorageBoxClient.EXPECT().
 		DeleteSubaccount(gomock.Any(), sbs).
@@ -63,7 +63,7 @@ func TestDeleteMultiple(t *testing.T) {
 		Name: "my-storage-box",
 	}
 
-	snapshots := []*hcloud.StorageBoxSubaccount{
+	subaccounts := []*hcloud.StorageBoxSubaccount{
 		{
 			ID:         123,
 			StorageBox: sb,
@@ -83,10 +83,11 @@ func TestDeleteMultiple(t *testing.T) {
 		Return(sb, nil, nil)
 
 	var ids []string
-	for _, sbs := range snapshots {
-		ids = append(ids, strconv.FormatInt(sbs.ID, 10))
+	for _, sbs := range subaccounts {
+		idStr := strconv.FormatInt(sbs.ID, 10)
+		ids = append(ids, idStr)
 		fx.Client.StorageBoxClient.EXPECT().
-			GetSubaccountByID(gomock.Any(), sb, sbs.ID).
+			GetSubaccount(gomock.Any(), sb, idStr).
 			Return(sbs, nil, nil)
 		fx.Client.StorageBoxClient.EXPECT().
 			DeleteSubaccount(gomock.Any(), sbs).

internal/cmd/storagebox/subaccount/describe_test.go

@@ -54,7 +54,7 @@ func TestDescribe(t *testing.T) {
 		Get(gomock.Any(), "my-storage-box").
 		Return(sb, nil, nil)
 	fx.Client.StorageBoxClient.EXPECT().
-		GetSubaccountByID(gomock.Any(), sb, int64(42)).
+		GetSubaccount(gomock.Any(), sb, "42").
 		Return(sbs, nil, nil)
 
 	out, errOut, err := fx.Run(cmd, []string{"my-storage-box", "42"})

internal/cmd/storagebox/subaccount/list_test.go

@@ -57,7 +57,7 @@ func TestList(t *testing.T) {
 		AllSubaccountsWithOpts(
 			gomock.Any(),
 			sb,
-			hcloud.StorageBoxSubaccountListOpts{},
+			hcloud.StorageBoxSubaccountListOpts{Sort: []string{"id:asc"}},
 		).
 		Return([]*hcloud.StorageBoxSubaccount{
 			sbs,

internal/cmd/storagebox/subaccount/reset_password_test.go

@@ -26,7 +26,7 @@ func TestResetPassword(t *testing.T) {
 		Get(gomock.Any(), "my-storage-box").
 		Return(sb, nil, nil)
 	fx.Client.StorageBoxClient.EXPECT().
-		GetSubaccountByID(gomock.Any(), sb, int64(456)).
+		GetSubaccount(gomock.Any(), sb, "456").
 		Return(sbs, nil, nil)
 	fx.Client.StorageBoxClient.EXPECT().
 		ResetSubaccountPassword(gomock.Any(), sbs, hcloud.StorageBoxSubaccountResetPasswordOpts{Password: "new-password"}).

internal/cmd/storagebox/subaccount/update_access_settings_test.go

@@ -26,7 +26,7 @@ func TestUpdateAccessSettings(t *testing.T) {
 		Get(gomock.Any(), "my-storage-box").
 		Return(sb, nil, nil)
 	fx.Client.StorageBoxClient.EXPECT().
-		GetSubaccountByID(gomock.Any(), sb, int64(456)).
+		GetSubaccount(gomock.Any(), sb, "456").
 		Return(sbs, nil, nil)
 	fx.Client.StorageBoxClient.EXPECT().
 		UpdateSubaccountAccessSettings(gomock.Any(), sbs, hcloud.StorageBoxSubaccountAccessSettingsUpdateOpts{
@@ -41,7 +41,7 @@ func TestUpdateAccessSettings(t *testing.T) {
 		WaitForActions(gomock.Any(), gomock.Any(), &hcloud.Action{ID: 456}).
 		Return(nil)
 
-	args := []string{"my-storage-box", "456", "--enable-ssh", "--enable-webdav=false", "--readonly=true", "--home-directory", "/new/home"}
+	args := []string{"my-storage-box", "456", "--enable-ssh", "--enable-webdav=false", "--readonly=true"}
 	out, errOut, err := fx.Run(cmd, args)
 
 	require.NoError(t, err)