Category List and Topic View Integration Test

app/assets/javascripts/discourse.js

@@ -22,6 +22,9 @@ Discourse = Ember.Application.createWithMixins({
   // The highest seen post number by topic
   highestSeenByTopic: {},
 
+  // Helps with integration tests
+  URL_FIXTURES: {},
+
   getURL: function(url) {
 
     // If it's a non relative URL, return it.

app/assets/javascripts/discourse/views/topic_view.js

@@ -388,7 +388,10 @@ Discourse.TopicView = Discourse.View.extend(Discourse.Scrolling, {
 
   nonUrgentPositionUpdate: Discourse.debounce(function(opts) {
     Discourse.ScreenTrack.instance().scrolled();
-    this.set('controller.currentPost', opts.currentPost);
+    var model = this.get('controller.model');
+    if (model) {
+      this.set('controller.currentPost', opts.currentPost);
+    }
   },500),
 
   scrolled: function(){

test/javascripts/integration/list_topics_test.js

@@ -1,14 +1,25 @@
 integration("List Topics");
 
-test("/", function() {
+test("Default List", function() {
 
   visit("/").then(function() {
     expect(2);
 
     ok(exists("#topic-list"), "The list of topics was rendered");
-    ok(count('#topic-list .topic-list-item') > 0, "has topics");
+    ok(exists('#topic-list .topic-list-item'), "has topics");
+  });
+
+});
+
+test("Categories List", function() {
+
+  visit("/categories").then(function() {
+    expect(1);
+
+    ok(exists('.category-list-item'), "has a list of categories");
   });
 
 });
 
 
+

test/javascripts/integration/view_topic_test.js

@@ -0,0 +1,12 @@
+integration("View Topic");
+
+test("View a Topic", function() {
+
+  visit("/t/internationalization-localization/280").then(function() {
+    expect(2);
+
+    ok(exists("#topic"), "The was rendered");
+    ok(exists("#topic .topic-post"), "The topic has posts");
+  });
+
+});

test/javascripts/test_helper.js

@@ -51,6 +51,14 @@ sinon.config = {
     useFakeServer: false
 };
 
+window.assetPath = function() { return null };
+
+var oldAjax = $.ajax;
+$.ajax = function() {
+  console.error("Discourse.Ajax called in test environment (" + arguments[0] + ")");
+  return oldAjax.apply(this, arguments);
+};
+
 // Trick JSHint into allow document.write
 var d = document;
 d.write('<div id="qunit-scratch" style="display:none"></div>');