Mirrors/go-inbucket
1
0
Fork 0
mirror of https://github.com/jhillyerd/inbucket.git synced 2025-12-17 17:47:03 +00:00
Code Issues Releases Wiki Activity

revert webui stuff

Browse Source
This commit is contained in:
Tomasz Wojtuń
2016-09-13 07:43:33 +02:00
committed by James Hillyerd
parent 02eee0a608
commit 8d36aa9750
2 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
webui/mailbox_controller.go
View File

@@ -19,7 +19,6 @@ type JSONMessageHeader struct {
Mailbox string Mailbox string
ID string `json:"Id"` ID string `json:"Id"`
From string From string
To string
Subject string Subject string
Date time.Time Date time.Time
Size int64 Size int64
@@ -30,7 +29,6 @@ type JSONMessage struct {
Mailbox string Mailbox string
ID string `json:"Id"` ID string `json:"Id"`
From string From string
To string
Subject string Subject string
Date time.Time Date time.Time
Size int64 Size int64
@@ -115,7 +113,6 @@ func MailboxList(w http.ResponseWriter, req *http.Request, ctx *httpd.Context) (
Mailbox: name, Mailbox: name,
ID: msg.ID(), ID: msg.ID(),
From: msg.From(), From: msg.From(),
To: msg.To(),
Subject: msg.Subject(), Subject: msg.Subject(),
Date: msg.Date(), Date: msg.Date(),
Size: msg.Size(), Size: msg.Size(),

20
webui/rest_test.go
View File

@@ -25,7 +25,6 @@ type OutputJSONHeader struct {
Mailbox string Mailbox string
ID string `json:"Id"` ID string `json:"Id"`
From, Subject, Date string From, Subject, Date string
To string
Size int Size int
} }
@@ -34,7 +33,6 @@ type OutputJSONMessage struct {
Mailbox string Mailbox string
ID string `json:"Id"` ID string `json:"Id"`
From, Subject, Date string From, Subject, Date string
To string
Size int Size int
Header map[string][]string Header map[string][]string
Body struct { Body struct {
@@ -48,7 +46,6 @@ type InputMessageData struct {
Mailbox string Mailbox string
ID string `json:"Id"` ID string `json:"Id"`
From, Subject string From, Subject string
To string
Date time.Time Date time.Time
Size int Size int
Header mail.Header Header mail.Header
@@ -60,7 +57,6 @@ func (d *InputMessageData) MockMessage() *MockMessage {
msg := &MockMessage{} msg := &MockMessage{}
msg.On("ID").Return(d.ID) msg.On("ID").Return(d.ID)
msg.On("From").Return(d.From) msg.On("From").Return(d.From)
msg.On("To").Return(d.To)
msg.On("Subject").Return(d.Subject) msg.On("Subject").Return(d.Subject)
msg.On("Date").Return(d.Date) msg.On("Date").Return(d.Date)
msg.On("Size").Return(d.Size) msg.On("Size").Return(d.Size)
@@ -89,10 +85,6 @@ func (d *InputMessageData) CompareToJSONHeader(j *OutputJSONHeader) (errors []st
errors = append(errors, fmt.Sprintf("Expected JSON.From=%q, got %q", d.From, errors = append(errors, fmt.Sprintf("Expected JSON.From=%q, got %q", d.From,
j.From)) j.From))
} }
if d.To != j.To {
errors = append(errors, fmt.Sprintf("Expected JSON.To=%q, got %q", d.To,
j.To))
}
if d.Subject != j.Subject { if d.Subject != j.Subject {
errors = append(errors, fmt.Sprintf("Expected JSON.Subject=%q, got %q", d.Subject, errors = append(errors, fmt.Sprintf("Expected JSON.Subject=%q, got %q", d.Subject,
j.Subject)) j.Subject))
@@ -123,10 +115,6 @@ func (d *InputMessageData) CompareToJSONMessage(j *OutputJSONMessage) (errors []
errors = append(errors, fmt.Sprintf("Expected JSON.From=%q, got %q", d.From, errors = append(errors, fmt.Sprintf("Expected JSON.From=%q, got %q", d.From,
j.From)) j.From))
} }
if d.To != j.To {
errors = append(errors, fmt.Sprintf("Expected JSON.To=%q, got %q", d.To,
j.To))
}
if d.Subject != j.Subject { if d.Subject != j.Subject {
errors = append(errors, fmt.Sprintf("Expected JSON.Subject=%q, got %q", d.Subject, errors = append(errors, fmt.Sprintf("Expected JSON.Subject=%q, got %q", d.Subject,
j.Subject)) j.Subject))
@@ -237,7 +225,6 @@ func TestRestMailboxList(t *testing.T) {
Mailbox: "good", Mailbox: "good",
ID: "0001", ID: "0001",
From: "from1", From: "from1",
To: "to1",
Subject: "subject 1", Subject: "subject 1",
Date: time.Date(2012, 2, 1, 10, 11, 12, 253, time.FixedZone("PST", -800)), Date: time.Date(2012, 2, 1, 10, 11, 12, 253, time.FixedZone("PST", -800)),
} }
@@ -245,7 +232,6 @@ func TestRestMailboxList(t *testing.T) {
Mailbox: "good", Mailbox: "good",
ID: "0002", ID: "0002",
From: "from2", From: "from2",
To: "to2",
Subject: "subject 2", Subject: "subject 2",
Date: time.Date(2012, 7, 1, 10, 11, 12, 253, time.FixedZone("PDT", -700)), Date: time.Date(2012, 7, 1, 10, 11, 12, 253, time.FixedZone("PDT", -700)),
} }
@@ -359,7 +345,6 @@ func TestRestMessage(t *testing.T) {
Mailbox: "good", Mailbox: "good",
ID: "0001", ID: "0001",
From: "from1", From: "from1",
To: "to1",
Subject: "subject 1", Subject: "subject 1",
Date: time.Date(2012, 2, 1, 10, 11, 12, 253, time.FixedZone("PST", -800)), Date: time.Date(2012, 2, 1, 10, 11, 12, 253, time.FixedZone("PST", -800)),
Header: mail.Header{ Header: mail.Header{
@@ -493,11 +478,6 @@ func (m *MockMessage) From() string {
return args.String(0) return args.String(0)
} }
func (m *MockMessage) To() string {
args := m.Called()
return args.String(0)
}
func (m *MockMessage) Date() time.Time { func (m *MockMessage) Date() time.Time {
args := m.Called() args := m.Called()
return args.Get(0).(time.Time) return args.Get(0).(time.Time)