Redirect to Summary when viewing yourself

This commit is contained in:
Robin Ward
2016-08-02 13:21:06 -04:00
parent d38727efb7
commit 857d54162b
9 changed files with 78 additions and 39 deletions
@@ -8,29 +8,35 @@ export function hasStream() {
});
}
// function hasTopicList() {
// andThen(() => {
// equal(count('.user-stream .item'), 0, "has no stream displayed");
// ok(count('.topic-list tr') > 0, 'it has a topic list');
// });
// }
function hasTopicList() {
andThen(() => {
equal(count('.user-stream .item'), 0, "has no stream displayed");
ok(count('.topic-list tr') > 0, 'it has a topic list');
});
}
// test("Filters", () => {
// visit("/users/eviltrout");
// hasStream();
//
// visit("/users/eviltrout/activity/topics");
// hasTopicList();
//
// visit("/users/eviltrout/activity/posts");
// hasStream();
//
// });
//
// test("Restricted Routes", () => {
// visit("/users/eviltrout/preferences");
//
// andThen(() => {
// equal(currentURL(), '/users/eviltrout/activity', "it redirects from preferences");
// });
// });
test("Root URL", () => {
visit("/users/eviltrout");
andThen(() => {
equal(currentPath(), 'user.userActivity.index', "it defaults to activity");
});
});
test("Filters", () => {
visit("/users/eviltrout/activity");
hasStream();
visit("/users/eviltrout/activity/topics");
hasTopicList();
visit("/users/eviltrout/activity/replies");
hasStream();
});
test("Restricted Routes", () => {
visit("/users/eviltrout/preferences");
andThen(() => {
equal(currentURL(), '/users/eviltrout/activity', "it redirects from preferences");
});
});
+13 -5
View File
@@ -1,9 +1,17 @@
import { acceptance } from "helpers/qunit-helpers";
// import { hasStream } from 'acceptance/user-anonymous-test';
import { hasStream } from 'acceptance/user-anonymous-test';
acceptance("User", {loggedIn: true});
// test("Pending", () => {
// visit("/users/eviltrout/activity/pending");
// hasStream();
// });
test("Pending", () => {
visit("/users/eviltrout/activity/pending");
hasStream();
});
test("Root URL - Viewing Self", () => {
visit("/users/eviltrout");
andThen(() => {
equal(currentPath(), 'user.summary', "it defaults to summary");
});
});
@@ -64,6 +64,18 @@ export default function() {
return response(json);
});
this.get('/users/eviltrout/summary.json', () => {
return response({
user_summary: {
topics: [],
topic_ids: [],
replies: [],
links: []
},
topics: [],
});
});
this.get('/clicks/track', success);
this.put('/users/eviltrout', () => response({ user: {} }));