1
0
mirror of https://github.com/jhillyerd/inbucket.git synced 2026-07-31 08:09:53 +00:00

Merge branch 'feature/gh-org' into develop for #126

This commit is contained in:
James Hillyerd
2019-02-24 10:36:31 -08:00
48 changed files with 154 additions and 144 deletions
+1 -1
View File
@@ -2,7 +2,7 @@ project_name: inbucket
release: release:
github: github:
owner: jhillyerd owner: inbucket
name: inbucket name: inbucket
name_template: '{{.Tag}}' name_template: '{{.Tag}}'
+27 -17
View File
@@ -10,6 +10,16 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- `posix-millis` field to REST message and header responses for easier date - `posix-millis` field to REST message and header responses for easier date
parsing. parsing.
### Changed
- Rewrote the user interface from scratch, it's now an Elm powered single page
application.
- Moved the Inbucket repository to its own GitHub organization.
## v2.1.0
No change from beta1.
## [v2.1.0-beta1] ## [v2.1.0-beta1]
@@ -104,7 +114,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- `rest/client` types `MessageHeader` and `Message` with convenience methods; - `rest/client` types `MessageHeader` and `Message` with convenience methods;
provides a more natural API provides a more natural API
- Powerful command line REST - Powerful command line REST
[client](https://github.com/jhillyerd/inbucket/wiki/cmd-client) [client](https://github.com/inbucket/inbucket/wiki/cmd-client)
- Allow use of `latest` as a message ID in REST calls - Allow use of `latest` as a message ID in REST calls
### Changed ### Changed
@@ -119,9 +129,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Added ### Added
- Storage of `To:` header in messages (likely breaks existing datastores) - Storage of `To:` header in messages (likely breaks existing datastores)
- Attachment list to [GET message - Attachment list to [GET message
JSON](https://github.com/jhillyerd/inbucket/wiki/REST-GET-message) JSON](https://github.com/inbucket/inbucket/wiki/REST-GET-message)
- [Go client for REST - [Go client for REST
API](https://godoc.org/github.com/jhillyerd/inbucket/rest/client) API](https://godoc.org/github.com/inbucket/inbucket/rest/client)
- Monitor feature: lists messages as they arrive, regardless of their - Monitor feature: lists messages as they arrive, regardless of their
destination mailbox destination mailbox
- Make `@inbucket` mailbox prompt configurable - Make `@inbucket` mailbox prompt configurable
@@ -184,19 +194,19 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Add Link button to messages, allows for directing another person to a - Add Link button to messages, allows for directing another person to a
specific message. specific message.
[Unreleased]: https://github.com/jhillyerd/inbucket/compare/master...develop [Unreleased]: https://github.com/inbucket/inbucket/compare/master...develop
[v2.1.0-beta1]: https://github.com/jhillyerd/inbucket/compare/v2.0.0...v2.1.0-beta1 [v2.1.0-beta1]: https://github.com/inbucket/inbucket/compare/v2.0.0...v2.1.0-beta1
[v2.0.0]: https://github.com/jhillyerd/inbucket/compare/v2.0.0-rc1...v2.0.0 [v2.0.0]: https://github.com/inbucket/inbucket/compare/v2.0.0-rc1...v2.0.0
[v2.0.0-rc1]: https://github.com/jhillyerd/inbucket/compare/v1.3.1...v2.0.0-rc1 [v2.0.0-rc1]: https://github.com/inbucket/inbucket/compare/v1.3.1...v2.0.0-rc1
[v1.3.1]: https://github.com/jhillyerd/inbucket/compare/v1.3.0...v1.3.1 [v1.3.1]: https://github.com/inbucket/inbucket/compare/v1.3.0...v1.3.1
[v1.3.0]: https://github.com/jhillyerd/inbucket/compare/v1.2.0...v1.3.0 [v1.3.0]: https://github.com/inbucket/inbucket/compare/v1.2.0...v1.3.0
[v1.2.0]: https://github.com/jhillyerd/inbucket/compare/1.2.0-rc2...1.2.0 [v1.2.0]: https://github.com/inbucket/inbucket/compare/1.2.0-rc2...1.2.0
[v1.2.0-rc2]: https://github.com/jhillyerd/inbucket/compare/1.2.0-rc1...1.2.0-rc2 [v1.2.0-rc2]: https://github.com/inbucket/inbucket/compare/1.2.0-rc1...1.2.0-rc2
[v1.2.0-rc1]: https://github.com/jhillyerd/inbucket/compare/1.1.0...1.2.0-rc1 [v1.2.0-rc1]: https://github.com/inbucket/inbucket/compare/1.1.0...1.2.0-rc1
[v1.1.0]: https://github.com/jhillyerd/inbucket/compare/1.1.0-rc2...1.1.0 [v1.1.0]: https://github.com/inbucket/inbucket/compare/1.1.0-rc2...1.1.0
[v1.1.0-rc2]: https://github.com/jhillyerd/inbucket/compare/1.1.0-rc1...1.1.0-rc2 [v1.1.0-rc2]: https://github.com/inbucket/inbucket/compare/1.1.0-rc1...1.1.0-rc2
[v1.1.0-rc1]: https://github.com/jhillyerd/inbucket/compare/1.0...1.1.0-rc1 [v1.1.0-rc1]: https://github.com/inbucket/inbucket/compare/1.0...1.1.0-rc1
[v1.0]: https://github.com/jhillyerd/inbucket/compare/1.0-rc1...1.0 [v1.0]: https://github.com/inbucket/inbucket/compare/1.0-rc1...1.0
## Release Checklist ## Release Checklist
@@ -209,7 +219,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
3. Run tests 3. Run tests
4. Test cross-compile: `goreleaser --snapshot` 4. Test cross-compile: `goreleaser --snapshot`
5. Commit changes and merge release: `git flow release finish` 5. Commit changes and merge release: `git flow release finish`
6. Push tags and wait for https://travis-ci.org/jhillyerd/inbucket build to 6. Push tags and wait for https://travis-ci.org/inbucket/inbucket build to
complete complete
7. Update `binary_versions` option in `inbucket-site/_config.yml` 7. Update `binary_versions` option in `inbucket-site/_config.yml`
+12 -12
View File
@@ -1,6 +1,6 @@
Inbucket Inbucket
============================================================================= =============================================================================
[![Build Status](https://travis-ci.org/jhillyerd/inbucket.png?branch=master)][Build Status] [![Build Status](https://travis-ci.org/inbucket/inbucket.png?branch=master)][Build Status]
Inbucket is an email testing service; it will accept messages for any email Inbucket is an email testing service; it will accept messages for any email
address and make them available via web, REST and POP3. Once compiled, address and make them available via web, REST and POP3. Once compiled,
@@ -8,7 +8,7 @@ Inbucket does not have any external dependencies (HTTP, SMTP, POP3 and storage
are all built in). are all built in).
A Go client for the REST API is available in A Go client for the REST API is available in
`github.com/jhillyerd/inbucket/pkg/rest/client` - [Go API docs] `github.com/inbucket/inbucket/pkg/rest/client` - [Go API docs]
Read more at the [Inbucket Website] Read more at the [Inbucket Website]
@@ -25,7 +25,7 @@ to contribute code to the project check out [CONTRIBUTING.md].
## Homebrew Tap ## Homebrew Tap
(currently broken, being tracked in [issue (currently broken, being tracked in [issue
#68](https://github.com/jhillyerd/inbucket/issues/68)) #68](https://github.com/inbucket/inbucket/issues/68))
Inbucket has an OS X [Homebrew] tap available as [jhillyerd/inbucket][Homebrew Tap], Inbucket has an OS X [Homebrew] tap available as [jhillyerd/inbucket][Homebrew Tap],
see the `README.md` there for installation instructions. see the `README.md` there for installation instructions.
@@ -37,12 +37,12 @@ You will need a functioning [Go installation][Google Go] for this to work.
Grab the Inbucket source code and compile the daemon: Grab the Inbucket source code and compile the daemon:
go get -v github.com/jhillyerd/inbucket/cmd/inbucket go get -v github.com/inbucket/inbucket/cmd/inbucket
Edit etc/inbucket.conf and tailor to your environment. It should work on most Edit etc/inbucket.conf and tailor to your environment. It should work on most
Unix and OS X machines as is. Launch the daemon: Unix and OS X machines as is. Launch the daemon:
$GOPATH/bin/inbucket $GOPATH/src/github.com/jhillyerd/inbucket/etc/inbucket.conf $GOPATH/bin/inbucket $GOPATH/src/github.com/inbucket/inbucket/etc/inbucket.conf
By default the SMTP server will be listening on localhost port 2500 and By default the SMTP server will be listening on localhost port 2500 and
the web interface will be available at [localhost:9000](http://localhost:9000/). the web interface will be available at [localhost:9000](http://localhost:9000/).
@@ -56,15 +56,15 @@ The Inbucket website has a more complete guide to
Inbucket is written in [Google Go] Inbucket is written in [Google Go]
Inbucket is open source software released under the MIT License. The latest Inbucket is open source software released under the MIT License. The latest
version can be found at https://github.com/jhillyerd/inbucket version can be found at https://github.com/inbucket/inbucket
[Go API docs]: https://godoc.org/github.com/jhillyerd/inbucket/pkg/rest/client [Go API docs]: https://godoc.org/github.com/inbucket/inbucket/pkg/rest/client
[Build Status]: https://travis-ci.org/jhillyerd/inbucket [Build Status]: https://travis-ci.org/inbucket/inbucket
[Change Log]: https://github.com/jhillyerd/inbucket/blob/master/CHANGELOG.md [Change Log]: https://github.com/inbucket/inbucket/blob/master/CHANGELOG.md
[CONTRIBUTING.md]: https://github.com/jhillyerd/inbucket/blob/develop/CONTRIBUTING.md [CONTRIBUTING.md]: https://github.com/inbucket/inbucket/blob/develop/CONTRIBUTING.md
[From Source]: http://www.inbucket.org/installation/from-source.html [From Source]: http://www.inbucket.org/installation/from-source.html
[Google Go]: http://golang.org/ [Google Go]: http://golang.org/
[Homebrew]: http://brew.sh/ [Homebrew]: http://brew.sh/
[Homebrew Tap]: https://github.com/jhillyerd/homebrew-inbucket [Homebrew Tap]: https://github.com/inbucket/homebrew-inbucket
[Inbucket Website]: http://www.inbucket.org/ [Inbucket Website]: http://www.inbucket.org/
[Issues List]: https://github.com/jhillyerd/inbucket/issues?state=open [Issues List]: https://github.com/inbucket/inbucket/issues?state=open
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"fmt" "fmt"
"github.com/google/subcommands" "github.com/google/subcommands"
"github.com/jhillyerd/inbucket/pkg/rest/client" "github.com/inbucket/inbucket/pkg/rest/client"
) )
type listCmd struct { type listCmd struct {
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"time" "time"
"github.com/google/subcommands" "github.com/google/subcommands"
"github.com/jhillyerd/inbucket/pkg/rest/client" "github.com/inbucket/inbucket/pkg/rest/client"
) )
type matchCmd struct { type matchCmd struct {
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"os" "os"
"github.com/google/subcommands" "github.com/google/subcommands"
"github.com/jhillyerd/inbucket/pkg/rest/client" "github.com/inbucket/inbucket/pkg/rest/client"
) )
type mboxCmd struct { type mboxCmd struct {
+12 -12
View File
@@ -14,18 +14,18 @@ import (
"syscall" "syscall"
"time" "time"
"github.com/jhillyerd/inbucket/pkg/config" "github.com/inbucket/inbucket/pkg/config"
"github.com/jhillyerd/inbucket/pkg/message" "github.com/inbucket/inbucket/pkg/message"
"github.com/jhillyerd/inbucket/pkg/msghub" "github.com/inbucket/inbucket/pkg/msghub"
"github.com/jhillyerd/inbucket/pkg/policy" "github.com/inbucket/inbucket/pkg/policy"
"github.com/jhillyerd/inbucket/pkg/rest" "github.com/inbucket/inbucket/pkg/rest"
"github.com/jhillyerd/inbucket/pkg/server/pop3" "github.com/inbucket/inbucket/pkg/server/pop3"
"github.com/jhillyerd/inbucket/pkg/server/smtp" "github.com/inbucket/inbucket/pkg/server/smtp"
"github.com/jhillyerd/inbucket/pkg/server/web" "github.com/inbucket/inbucket/pkg/server/web"
"github.com/jhillyerd/inbucket/pkg/storage" "github.com/inbucket/inbucket/pkg/storage"
"github.com/jhillyerd/inbucket/pkg/storage/file" "github.com/inbucket/inbucket/pkg/storage/file"
"github.com/jhillyerd/inbucket/pkg/storage/mem" "github.com/inbucket/inbucket/pkg/storage/mem"
"github.com/jhillyerd/inbucket/pkg/webui" "github.com/inbucket/inbucket/pkg/webui"
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
) )
+1 -1
View File
@@ -1,4 +1,4 @@
module github.com/jhillyerd/inbucket module github.com/inbucket/inbucket
require ( require (
github.com/davecgh/go-spew v1.1.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"text/tabwriter" "text/tabwriter"
"time" "time"
"github.com/jhillyerd/inbucket/pkg/stringutil" "github.com/inbucket/inbucket/pkg/stringutil"
"github.com/kelseyhightower/envconfig" "github.com/kelseyhightower/envconfig"
) )
+4 -4
View File
@@ -7,11 +7,11 @@ import (
"strings" "strings"
"time" "time"
"github.com/inbucket/inbucket/pkg/msghub"
"github.com/inbucket/inbucket/pkg/policy"
"github.com/inbucket/inbucket/pkg/storage"
"github.com/inbucket/inbucket/pkg/stringutil"
"github.com/jhillyerd/enmime" "github.com/jhillyerd/enmime"
"github.com/jhillyerd/inbucket/pkg/msghub"
"github.com/jhillyerd/inbucket/pkg/policy"
"github.com/jhillyerd/inbucket/pkg/storage"
"github.com/jhillyerd/inbucket/pkg/stringutil"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
) )
+1 -1
View File
@@ -8,8 +8,8 @@ import (
"net/textproto" "net/textproto"
"time" "time"
"github.com/inbucket/inbucket/pkg/storage"
"github.com/jhillyerd/enmime" "github.com/jhillyerd/enmime"
"github.com/jhillyerd/inbucket/pkg/storage"
) )
// Metadata holds information about a message, but not the content. // Metadata holds information about a message, but not the content.
+2 -2
View File
@@ -6,8 +6,8 @@ import (
"net/mail" "net/mail"
"strings" "strings"
"github.com/jhillyerd/inbucket/pkg/config" "github.com/inbucket/inbucket/pkg/config"
"github.com/jhillyerd/inbucket/pkg/stringutil" "github.com/inbucket/inbucket/pkg/stringutil"
) )
// Addressing handles email address policy. // Addressing handles email address policy.
+2 -2
View File
@@ -4,8 +4,8 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/jhillyerd/inbucket/pkg/config" "github.com/inbucket/inbucket/pkg/config"
"github.com/jhillyerd/inbucket/pkg/policy" "github.com/inbucket/inbucket/pkg/policy"
) )
func TestShouldAcceptDomain(t *testing.T) { func TestShouldAcceptDomain(t *testing.T) {
+4 -4
View File
@@ -10,10 +10,10 @@ import (
"encoding/json" "encoding/json"
"strconv" "strconv"
"github.com/jhillyerd/inbucket/pkg/rest/model" "github.com/inbucket/inbucket/pkg/rest/model"
"github.com/jhillyerd/inbucket/pkg/server/web" "github.com/inbucket/inbucket/pkg/server/web"
"github.com/jhillyerd/inbucket/pkg/storage" "github.com/inbucket/inbucket/pkg/storage"
"github.com/jhillyerd/inbucket/pkg/stringutil" "github.com/inbucket/inbucket/pkg/stringutil"
) )
// MailboxListV1 renders a list of messages in a mailbox // MailboxListV1 renders a list of messages in a mailbox
+2 -2
View File
@@ -9,9 +9,9 @@ import (
"testing" "testing"
"time" "time"
"github.com/inbucket/inbucket/pkg/message"
"github.com/inbucket/inbucket/pkg/test"
"github.com/jhillyerd/enmime" "github.com/jhillyerd/enmime"
"github.com/jhillyerd/inbucket/pkg/message"
"github.com/jhillyerd/inbucket/pkg/test"
) )
const ( const (
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"net/url" "net/url"
"time" "time"
"github.com/jhillyerd/inbucket/pkg/rest/model" "github.com/inbucket/inbucket/pkg/rest/model"
) )
// Client accesses the Inbucket REST API v1 // Client accesses the Inbucket REST API v1
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/jhillyerd/inbucket/pkg/rest/client" "github.com/inbucket/inbucket/pkg/rest/client"
) )
func TestClientV1ListMailbox(t *testing.T) { func TestClientV1ListMailbox(t *testing.T) {
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"net/http/httptest" "net/http/httptest"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/jhillyerd/inbucket/pkg/rest/client" "github.com/inbucket/inbucket/pkg/rest/client"
) )
// Example demonstrates basic usage for the Inbucket REST client. // Example demonstrates basic usage for the Inbucket REST client.
+1 -1
View File
@@ -1,7 +1,7 @@
package rest package rest
import "github.com/gorilla/mux" import "github.com/gorilla/mux"
import "github.com/jhillyerd/inbucket/pkg/server/web" import "github.com/inbucket/inbucket/pkg/server/web"
// SetupRoutes populates the routes for the REST interface // SetupRoutes populates the routes for the REST interface
func SetupRoutes(r *mux.Router) { func SetupRoutes(r *mux.Router) {
+3 -3
View File
@@ -5,9 +5,9 @@ import (
"time" "time"
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
"github.com/jhillyerd/inbucket/pkg/msghub" "github.com/inbucket/inbucket/pkg/msghub"
"github.com/jhillyerd/inbucket/pkg/rest/model" "github.com/inbucket/inbucket/pkg/rest/model"
"github.com/jhillyerd/inbucket/pkg/server/web" "github.com/inbucket/inbucket/pkg/server/web"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
) )
+4 -4
View File
@@ -9,10 +9,10 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/jhillyerd/inbucket/pkg/config" "github.com/inbucket/inbucket/pkg/config"
"github.com/jhillyerd/inbucket/pkg/message" "github.com/inbucket/inbucket/pkg/message"
"github.com/jhillyerd/inbucket/pkg/msghub" "github.com/inbucket/inbucket/pkg/msghub"
"github.com/jhillyerd/inbucket/pkg/server/web" "github.com/inbucket/inbucket/pkg/server/web"
) )
func testRestGet(url string) (*httptest.ResponseRecorder, error) { func testRestGet(url string) (*httptest.ResponseRecorder, error) {
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/jhillyerd/inbucket/pkg/storage" "github.com/inbucket/inbucket/pkg/storage"
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
) )
+2 -2
View File
@@ -6,8 +6,8 @@ import (
"sync" "sync"
"time" "time"
"github.com/jhillyerd/inbucket/pkg/config" "github.com/inbucket/inbucket/pkg/config"
"github.com/jhillyerd/inbucket/pkg/storage" "github.com/inbucket/inbucket/pkg/storage"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
) )
+1 -1
View File
@@ -13,7 +13,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/jhillyerd/inbucket/pkg/policy" "github.com/inbucket/inbucket/pkg/policy"
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
) )
+5 -5
View File
@@ -12,11 +12,11 @@ import (
"testing" "testing"
"time" "time"
"github.com/jhillyerd/inbucket/pkg/config" "github.com/inbucket/inbucket/pkg/config"
"github.com/jhillyerd/inbucket/pkg/message" "github.com/inbucket/inbucket/pkg/message"
"github.com/jhillyerd/inbucket/pkg/policy" "github.com/inbucket/inbucket/pkg/policy"
"github.com/jhillyerd/inbucket/pkg/storage" "github.com/inbucket/inbucket/pkg/storage"
"github.com/jhillyerd/inbucket/pkg/test" "github.com/inbucket/inbucket/pkg/test"
) )
type scriptStep struct { type scriptStep struct {
+4 -4
View File
@@ -9,10 +9,10 @@ import (
"sync" "sync"
"time" "time"
"github.com/jhillyerd/inbucket/pkg/config" "github.com/inbucket/inbucket/pkg/config"
"github.com/jhillyerd/inbucket/pkg/message" "github.com/inbucket/inbucket/pkg/message"
"github.com/jhillyerd/inbucket/pkg/metric" "github.com/inbucket/inbucket/pkg/metric"
"github.com/jhillyerd/inbucket/pkg/policy" "github.com/inbucket/inbucket/pkg/policy"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
) )
+3 -3
View File
@@ -5,9 +5,9 @@ import (
"strings" "strings"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/jhillyerd/inbucket/pkg/config" "github.com/inbucket/inbucket/pkg/config"
"github.com/jhillyerd/inbucket/pkg/message" "github.com/inbucket/inbucket/pkg/message"
"github.com/jhillyerd/inbucket/pkg/msghub" "github.com/inbucket/inbucket/pkg/msghub"
) )
// Context is passed into every request handler function // Context is passed into every request handler function
+3 -3
View File
@@ -13,9 +13,9 @@ import (
"time" "time"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/jhillyerd/inbucket/pkg/config" "github.com/inbucket/inbucket/pkg/config"
"github.com/jhillyerd/inbucket/pkg/message" "github.com/inbucket/inbucket/pkg/message"
"github.com/jhillyerd/inbucket/pkg/msghub" "github.com/inbucket/inbucket/pkg/msghub"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
) )
+3 -3
View File
@@ -9,9 +9,9 @@ import (
"sync" "sync"
"time" "time"
"github.com/jhillyerd/inbucket/pkg/config" "github.com/inbucket/inbucket/pkg/config"
"github.com/jhillyerd/inbucket/pkg/storage" "github.com/inbucket/inbucket/pkg/storage"
"github.com/jhillyerd/inbucket/pkg/stringutil" "github.com/inbucket/inbucket/pkg/stringutil"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
) )
+4 -4
View File
@@ -13,10 +13,10 @@ import (
"testing" "testing"
"time" "time"
"github.com/jhillyerd/inbucket/pkg/config" "github.com/inbucket/inbucket/pkg/config"
"github.com/jhillyerd/inbucket/pkg/message" "github.com/inbucket/inbucket/pkg/message"
"github.com/jhillyerd/inbucket/pkg/storage" "github.com/inbucket/inbucket/pkg/storage"
"github.com/jhillyerd/inbucket/pkg/test" "github.com/inbucket/inbucket/pkg/test"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )
+1 -1
View File
@@ -9,7 +9,7 @@ import (
"path/filepath" "path/filepath"
"sync" "sync"
"github.com/jhillyerd/inbucket/pkg/storage" "github.com/inbucket/inbucket/pkg/storage"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
) )
+1 -1
View File
@@ -3,7 +3,7 @@ package storage_test
import ( import (
"testing" "testing"
"github.com/jhillyerd/inbucket/pkg/storage" "github.com/inbucket/inbucket/pkg/storage"
) )
func TestHashLock(t *testing.T) { func TestHashLock(t *testing.T) {
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"net/mail" "net/mail"
"time" "time"
"github.com/jhillyerd/inbucket/pkg/storage" "github.com/inbucket/inbucket/pkg/storage"
) )
// Message is a memory store message. // Message is a memory store message.
+2 -2
View File
@@ -7,8 +7,8 @@ import (
"strconv" "strconv"
"sync" "sync"
"github.com/jhillyerd/inbucket/pkg/config" "github.com/inbucket/inbucket/pkg/config"
"github.com/jhillyerd/inbucket/pkg/storage" "github.com/inbucket/inbucket/pkg/storage"
) )
// Store implements an in-memory message store. // Store implements an in-memory message store.
+3 -3
View File
@@ -5,9 +5,9 @@ import (
"testing" "testing"
"time" "time"
"github.com/jhillyerd/inbucket/pkg/config" "github.com/inbucket/inbucket/pkg/config"
"github.com/jhillyerd/inbucket/pkg/storage" "github.com/inbucket/inbucket/pkg/storage"
"github.com/jhillyerd/inbucket/pkg/test" "github.com/inbucket/inbucket/pkg/test"
) )
// TestSuite runs storage package test suite on file store. // TestSuite runs storage package test suite on file store.
+2 -2
View File
@@ -5,8 +5,8 @@ import (
"expvar" "expvar"
"time" "time"
"github.com/jhillyerd/inbucket/pkg/config" "github.com/inbucket/inbucket/pkg/config"
"github.com/jhillyerd/inbucket/pkg/metric" "github.com/inbucket/inbucket/pkg/metric"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
) )
+4 -4
View File
@@ -5,10 +5,10 @@ import (
"testing" "testing"
"time" "time"
"github.com/jhillyerd/inbucket/pkg/config" "github.com/inbucket/inbucket/pkg/config"
"github.com/jhillyerd/inbucket/pkg/message" "github.com/inbucket/inbucket/pkg/message"
"github.com/jhillyerd/inbucket/pkg/storage" "github.com/inbucket/inbucket/pkg/storage"
"github.com/jhillyerd/inbucket/pkg/test" "github.com/inbucket/inbucket/pkg/test"
) )
func TestDoRetentionScan(t *testing.T) { func TestDoRetentionScan(t *testing.T) {
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"net/mail" "net/mail"
"time" "time"
"github.com/jhillyerd/inbucket/pkg/config" "github.com/inbucket/inbucket/pkg/config"
) )
var ( var (
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"net/mail" "net/mail"
"testing" "testing"
"github.com/jhillyerd/inbucket/pkg/stringutil" "github.com/inbucket/inbucket/pkg/stringutil"
) )
func TestHashMailboxName(t *testing.T) { func TestHashMailboxName(t *testing.T) {
+11 -11
View File
@@ -11,18 +11,18 @@ import (
"testing" "testing"
"time" "time"
"github.com/inbucket/inbucket/pkg/config"
"github.com/inbucket/inbucket/pkg/message"
"github.com/inbucket/inbucket/pkg/msghub"
"github.com/inbucket/inbucket/pkg/policy"
"github.com/inbucket/inbucket/pkg/rest"
"github.com/inbucket/inbucket/pkg/rest/client"
"github.com/inbucket/inbucket/pkg/server/smtp"
"github.com/inbucket/inbucket/pkg/server/web"
"github.com/inbucket/inbucket/pkg/storage"
"github.com/inbucket/inbucket/pkg/storage/mem"
"github.com/inbucket/inbucket/pkg/webui"
"github.com/jhillyerd/goldiff" "github.com/jhillyerd/goldiff"
"github.com/jhillyerd/inbucket/pkg/config"
"github.com/jhillyerd/inbucket/pkg/message"
"github.com/jhillyerd/inbucket/pkg/msghub"
"github.com/jhillyerd/inbucket/pkg/policy"
"github.com/jhillyerd/inbucket/pkg/rest"
"github.com/jhillyerd/inbucket/pkg/rest/client"
"github.com/jhillyerd/inbucket/pkg/server/smtp"
"github.com/jhillyerd/inbucket/pkg/server/web"
"github.com/jhillyerd/inbucket/pkg/storage"
"github.com/jhillyerd/inbucket/pkg/storage/mem"
"github.com/jhillyerd/inbucket/pkg/webui"
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
) )
+4 -4
View File
@@ -3,10 +3,10 @@ package test
import ( import (
"errors" "errors"
"github.com/jhillyerd/inbucket/pkg/config" "github.com/inbucket/inbucket/pkg/config"
"github.com/jhillyerd/inbucket/pkg/message" "github.com/inbucket/inbucket/pkg/message"
"github.com/jhillyerd/inbucket/pkg/policy" "github.com/inbucket/inbucket/pkg/policy"
"github.com/jhillyerd/inbucket/pkg/storage" "github.com/inbucket/inbucket/pkg/storage"
) )
// ManagerStub is a test stub for message.Manager // ManagerStub is a test stub for message.Manager
+1 -1
View File
@@ -3,7 +3,7 @@ package test
import ( import (
"errors" "errors"
"github.com/jhillyerd/inbucket/pkg/storage" "github.com/inbucket/inbucket/pkg/storage"
) )
// StoreStub stubs storage.Store for testing. // StoreStub stubs storage.Store for testing.
+3 -3
View File
@@ -9,9 +9,9 @@ import (
"testing" "testing"
"time" "time"
"github.com/jhillyerd/inbucket/pkg/config" "github.com/inbucket/inbucket/pkg/config"
"github.com/jhillyerd/inbucket/pkg/message" "github.com/inbucket/inbucket/pkg/message"
"github.com/jhillyerd/inbucket/pkg/storage" "github.com/inbucket/inbucket/pkg/storage"
) )
// StoreFactory returns a new store for the test suite. // StoreFactory returns a new store for the test suite.
+4 -4
View File
@@ -7,10 +7,10 @@ import (
"net/http" "net/http"
"strconv" "strconv"
"github.com/jhillyerd/inbucket/pkg/server/web" "github.com/inbucket/inbucket/pkg/server/web"
"github.com/jhillyerd/inbucket/pkg/storage" "github.com/inbucket/inbucket/pkg/storage"
"github.com/jhillyerd/inbucket/pkg/stringutil" "github.com/inbucket/inbucket/pkg/stringutil"
"github.com/jhillyerd/inbucket/pkg/webui/sanitize" "github.com/inbucket/inbucket/pkg/webui/sanitize"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
) )
+2 -2
View File
@@ -5,8 +5,8 @@ import (
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"github.com/jhillyerd/inbucket/pkg/config" "github.com/inbucket/inbucket/pkg/config"
"github.com/jhillyerd/inbucket/pkg/server/web" "github.com/inbucket/inbucket/pkg/server/web"
) )
// RootGreeting serves the Inbucket greeting. // RootGreeting serves the Inbucket greeting.
+1 -1
View File
@@ -3,7 +3,7 @@ package webui
import ( import (
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/jhillyerd/inbucket/pkg/server/web" "github.com/inbucket/inbucket/pkg/server/web"
) )
// SetupRoutes populates routes for the webui into the provided Router. // SetupRoutes populates routes for the webui into the provided Router.
+1 -1
View File
@@ -3,7 +3,7 @@ package sanitize_test
import ( import (
"testing" "testing"
"github.com/jhillyerd/inbucket/pkg/webui/sanitize" "github.com/inbucket/inbucket/pkg/webui/sanitize"
) )
// TestHTMLPlainStrings test plain text passthrough // TestHTMLPlainStrings test plain text passthrough
+1 -1
View File
@@ -151,7 +151,7 @@ frame { model, session, activePage, activeMailbox, modal, content } =
[ div [ class "footer" ] [ div [ class "footer" ]
[ externalLink "https://www.inbucket.org" "Inbucket" [ externalLink "https://www.inbucket.org" "Inbucket"
, text " is an open source project hosted on " , text " is an open source project hosted on "
, externalLink "https://github.com/jhillyerd/inbucket" "GitHub" , externalLink "https://github.com/inbucket/inbucket" "GitHub"
, text "." , text "."
] ]
] ]