summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReed Garmsen <rgarmsen2295@gmail.com>2015-11-13 17:15:09 -0800
committerReed Garmsen <rgarmsen2295@gmail.com>2015-11-13 17:15:09 -0800
commit1874a16666cdcf65b11f2d0f03d50d6b880e15f7 (patch)
treed47b0f05e01a4af0b3aaed022f8fbe6435183a15
parenteacc06c7fc712e8b2e71c408327a449bc32c34d9 (diff)
downloadchat-1874a16666cdcf65b11f2d0f03d50d6b880e15f7.tar.gz
chat-1874a16666cdcf65b11f2d0f03d50d6b880e15f7.tar.bz2
chat-1874a16666cdcf65b11f2d0f03d50d6b880e15f7.zip
Fixed unit test issues
-rw-r--r--api/channel_test.go3
-rw-r--r--web/sass-files/sass/partials/_forms.scss2
2 files changed, 3 insertions, 2 deletions
diff --git a/api/channel_test.go b/api/channel_test.go
index faed387dd..e7e1f4eb0 100644
--- a/api/channel_test.go
+++ b/api/channel_test.go
@@ -215,8 +215,9 @@ func TestUpdateChannel(t *testing.T) {
for _, c := range data.Channels {
if c.Name == model.DEFAULT_CHANNEL {
c.Header = "new header"
+ c.Name = "pseudo-square"
if _, err := Client.UpdateChannel(c); err == nil {
- t.Fatal("should have errored on updating default channel")
+ t.Fatal("should have errored on updating default channel name")
}
break
}
diff --git a/web/sass-files/sass/partials/_forms.scss b/web/sass-files/sass/partials/_forms.scss
index 9499d9b53..685677ad0 100644
--- a/web/sass-files/sass/partials/_forms.scss
+++ b/web/sass-files/sass/partials/_forms.scss
@@ -46,4 +46,4 @@
.disabled-input {
background-color: #dddddd !important;
-} \ No newline at end of file
+}