Merge pull request #277 from ZogStriP/master

formatted some tests

Guardfile

@@ -8,7 +8,7 @@ guard :spork, wait: 120 do
   watch('spec/spec_helper.rb') { :rspec }
 end
 
-phantom_path = File.expand_path('~/phantomjs/bin/phantomjs') 
+phantom_path = File.expand_path('~/phantomjs/bin/phantomjs')
 phantom_path = nil unless File.exists?(phantom_path)
 
 jasmine_options = {:phantomjs_bin => phantom_path}
@@ -22,7 +22,8 @@ else
   jasmine_options[:server_timeout] = 300
 end
 
-guard 'jasmine', jasmine_options do watch(%r{spec/javascripts/spec\.js$})         { "spec/javascripts" }
+guard 'jasmine', jasmine_options do
+  watch(%r{spec/javascripts/spec\.js$})         { "spec/javascripts" }
   watch(%r{spec/javascripts/.+_spec\.js$})
   watch(%r{app/assets/javascripts/(.+?)\.js$})  { "spec/javascripts" }
 end
@@ -37,8 +38,7 @@ end
 
 guard 'rspec', :focus_on_failed => true, :cli => "--drb" do
   watch(%r{^spec/.+_spec\.rb$})
-  #watch(%r{^lib/jobs/(.+)\.rb$})     { |m| "spec/components/jobs/#{m[1]}_spec.rb" }  
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/components/#{m[1]}_spec.rb" }
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/components/#{m[1]}_spec.rb" }  
   watch('spec/spec_helper.rb')  { "spec" }
 
   # Rails example
@@ -47,10 +47,10 @@ guard 'rspec', :focus_on_failed => true, :cli => "--drb" do
   watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb" }
   watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
   watch('app/controllers/application_controller.rb')  { "spec/controllers" }
-  
+
   # Capybara request specs
   watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/requests/#{m[1]}_spec.rb" }
-  
+
 end
 
 
@@ -86,7 +86,7 @@ Thread.new do
   end
 end
 
-guard :autoreload do 
+guard :autoreload do
   watch(/tmp\/refresh_browser/)
   watch(/\.css$/)
   watch(/\.sass$/)
@@ -94,5 +94,3 @@ guard :autoreload do
   watch(/\.sass\.erb$/)
   watch(/\.handlebars$/)
 end
-
-

spec/javascripts/bbcode_spec.js

@@ -1,179 +1,218 @@
 /*global waitsFor:true expect:true describe:true beforeEach:true it:true */
-  describe("Discourse.BBCode", function() {
+
-    var format;
+describe("Discourse.BBCode", function() {
-    format = Discourse.BBCode.format;
+  var format = Discourse.BBCode.format;
-    describe('default replacer', function() {
+
-      describe("simple tags", function() {
+  describe('default replacer', function() {
-        it("bolds text", function() {
+
-          return expect(format("[b]strong[/b]")).toBe("<span class='bbcode-b'>strong</span>");
+    describe("simple tags", function() {
-        });
+
-        it("italics text", function() {
+      it("bolds text", function() {
-          return expect(format("[i]emphasis[/i]")).toBe("<span class='bbcode-i'>emphasis</span>");
+        expect(format("[b]strong[/b]")).toBe("<span class='bbcode-b'>strong</span>");
-        });
-        it("underlines text", function() {
-          return expect(format("[u]underlined[/u]")).toBe("<span class='bbcode-u'>underlined</span>");
-        });
-        it("strikes-through text", function() {
-          return expect(format("[s]strikethrough[/s]")).toBe("<span class='bbcode-s'>strikethrough</span>");
-        });
-        it("makes code into pre", function() {
-          return expect(format("[code]\nx++\n[/code]")).toBe("<pre>\nx++\n</pre>");
-        });
-        it("supports spoiler tags", function() {
-          return expect(format("[spoiler]it's a sled[/spoiler]")).toBe("<span class=\"spoiler\">it's a sled</span>");
-        });
-        it("links images", function() {
-          return expect(format("[img]http://eviltrout.com/eviltrout.png[/img]")).toBe("<img src=\"http://eviltrout.com/eviltrout.png\">");
-        });
-        it("supports [url] without a title", function() {
-          return expect(format("[url]http://bettercallsaul.com[/url]")).toBe("<a href=\"http://bettercallsaul.com\">http://bettercallsaul.com</a>");
-        });
-        return it("supports [email] without a title", function() {
-          return expect(format("[email]eviltrout@mailinator.com[/email]")).toBe("<a href=\"mailto:eviltrout@mailinator.com\">eviltrout@mailinator.com</a>");
-        });
       });
-      describe("lists", function() {
+
-        it("creates an ul", function() {
+      it("italics text", function() {
-          return expect(format("[ul][li]option one[/li][/ul]")).toBe("<ul><li>option one</li></ul>");
+        expect(format("[i]emphasis[/i]")).toBe("<span class='bbcode-i'>emphasis</span>");
-        });
-        return it("creates an ol", function() {
-          return expect(format("[ol][li]option one[/li][/ol]")).toBe("<ol><li>option one</li></ol>");
-        });
       });
-      describe("color", function() {
+
-        it("supports [color=] with a short hex value", function() {
+      it("underlines text", function() {
-          return expect(format("[color=#00f]blue[/color]")).toBe("<span style=\"color: #00f\">blue</span>");
+        expect(format("[u]underlined[/u]")).toBe("<span class='bbcode-u'>underlined</span>");
-        });
-        it("supports [color=] with a long hex value", function() {
-          return expect(format("[color=#ffff00]yellow[/color]")).toBe("<span style=\"color: #ffff00\">yellow</span>");
-        });
-        it("supports [color=] with an html color", function() {
-          return expect(format("[color=red]red[/color]")).toBe("<span style=\"color: red\">red</span>");
-        });
-        return it("it performs a noop on invalid input", function() {
-          return expect(format("[color=javascript:alert('wat')]noop[/color]")).toBe("noop");
-        });
       });
-      describe("tags with arguments", function() {
+
-        it("supports [size=]", function() {
+      it("strikes-through text", function() {
-          return expect(format("[size=35]BIG[/size]")).toBe("<span class=\"bbcode-size-35\">BIG</span>");
+        expect(format("[s]strikethrough[/s]")).toBe("<span class='bbcode-s'>strikethrough</span>");
-        });
-        it("supports [url] with a title", function() {
-          return expect(format("[url=http://bettercallsaul.com]better call![/url]")).toBe("<a href=\"http://bettercallsaul.com\">better call!</a>");
-        });
-        return it("supports [email] with a title", function() {
-          return expect(format("[email=eviltrout@mailinator.com]evil trout[/email]")).toBe("<a href=\"mailto:eviltrout@mailinator.com\">evil trout</a>");
-        });
       });
-      return describe("more complicated", function() {
+
-        it("can nest tags", function() {
+      it("makes code into pre", function() {
-          return expect(format("[u][i]abc[/i][/u]")).toBe("<span class='bbcode-u'><span class='bbcode-i'>abc</span></span>");
+        expect(format("[code]\nx++\n[/code]")).toBe("<pre>\nx++\n</pre>");
-        });
-        return it("can bold two things on the same line", function() {
-          return expect(format("[b]first[/b] [b]second[/b]")).toBe("<span class='bbcode-b'>first</span> <span class='bbcode-b'>second</span>");
-        });
       });
+
+      it("supports spoiler tags", function() {
+        expect(format("[spoiler]it's a sled[/spoiler]")).toBe("<span class=\"spoiler\">it's a sled</span>");
+      });
+
+      it("links images", function() {
+        expect(format("[img]http://eviltrout.com/eviltrout.png[/img]")).toBe("<img src=\"http://eviltrout.com/eviltrout.png\">");
+      });
+
+      it("supports [url] without a title", function() {
+        expect(format("[url]http://bettercallsaul.com[/url]")).toBe("<a href=\"http://bettercallsaul.com\">http://bettercallsaul.com</a>");
+      });
+
+      it("supports [email] without a title", function() {
+        expect(format("[email]eviltrout@mailinator.com[/email]")).toBe("<a href=\"mailto:eviltrout@mailinator.com\">eviltrout@mailinator.com</a>");
+      });
+
     });
-    return describe('email environment', function() {
+
-      describe("simple tags", function() {
+    describe("lists", function() {
-        it("bolds text", function() {
+
-          return expect(format("[b]strong[/b]", {
+      it("creates an ul", function() {
-            environment: 'email'
+        expect(format("[ul][li]option one[/li][/ul]")).toBe("<ul><li>option one</li></ul>");
-          })).toBe("<b>strong</b>");
-        });
-        it("italics text", function() {
-          return expect(format("[i]emphasis[/i]", {
-            environment: 'email'
-          })).toBe("<i>emphasis</i>");
-        });
-        it("underlines text", function() {
-          return expect(format("[u]underlined[/u]", {
-            environment: 'email'
-          })).toBe("<u>underlined</u>");
-        });
-        it("strikes-through text", function() {
-          return expect(format("[s]strikethrough[/s]", {
-            environment: 'email'
-          })).toBe("<s>strikethrough</s>");
-        });
-        it("makes code into pre", function() {
-          return expect(format("[code]\nx++\n[/code]", {
-            environment: 'email'
-          })).toBe("<pre>\nx++\n</pre>");
-        });
-        it("supports spoiler tags", function() {
-          return expect(format("[spoiler]it's a sled[/spoiler]", {
-            environment: 'email'
-          })).toBe("<span style='background-color: #000'>it's a sled</span>");
-        });
-        it("links images", function() {
-          return expect(format("[img]http://eviltrout.com/eviltrout.png[/img]", {
-            environment: 'email'
-          })).toBe("<img src=\"http://eviltrout.com/eviltrout.png\">");
-        });
-        it("supports [url] without a title", function() {
-          return expect(format("[url]http://bettercallsaul.com[/url]", {
-            environment: 'email'
-          })).toBe("<a href=\"http://bettercallsaul.com\">http://bettercallsaul.com</a>");
-        });
-        return it("supports [email] without a title", function() {
-          return expect(format("[email]eviltrout@mailinator.com[/email]", {
-            environment: 'email'
-          })).toBe("<a href=\"mailto:eviltrout@mailinator.com\">eviltrout@mailinator.com</a>");
-        });
       });
-      describe("lists", function() {
+
-        it("creates an ul", function() {
+      it("creates an ol", function() {
-          return expect(format("[ul][li]option one[/li][/ul]", {
+        expect(format("[ol][li]option one[/li][/ol]")).toBe("<ol><li>option one</li></ol>");
-            environment: 'email'
-          })).toBe("<ul><li>option one</li></ul>");
-        });
-        return it("creates an ol", function() {
-          return expect(format("[ol][li]option one[/li][/ol]", {
-            environment: 'email'
-          })).toBe("<ol><li>option one</li></ol>");
-        });
-      });
-      describe("color", function() {
-        it("supports [color=] with a short hex value", function() {
-          return expect(format("[color=#00f]blue[/color]", {
-            environment: 'email'
-          })).toBe("<span style=\"color: #00f\">blue</span>");
-        });
-        it("supports [color=] with a long hex value", function() {
-          return expect(format("[color=#ffff00]yellow[/color]", {
-            environment: 'email'
-          })).toBe("<span style=\"color: #ffff00\">yellow</span>");
-        });
-        it("supports [color=] with an html color", function() {
-          return expect(format("[color=red]red[/color]", {
-            environment: 'email'
-          })).toBe("<span style=\"color: red\">red</span>");
-        });
-        return it("it performs a noop on invalid input", function() {
-          return expect(format("[color=javascript:alert('wat')]noop[/color]", {
-            environment: 'email'
-          })).toBe("noop");
-        });
-      });
-      return describe("tags with arguments", function() {
-        it("supports [size=]", function() {
-          return expect(format("[size=35]BIG[/size]", {
-            environment: 'email'
-          })).toBe("<span style=\"font-size: 35px\">BIG</span>");
-        });
-        it("supports [url] with a title", function() {
-          return expect(format("[url=http://bettercallsaul.com]better call![/url]", {
-            environment: 'email'
-          })).toBe("<a href=\"http://bettercallsaul.com\">better call!</a>");
-        });
-        return it("supports [email] with a title", function() {
-          return expect(format("[email=eviltrout@mailinator.com]evil trout[/email]", {
-            environment: 'email'
-          })).toBe("<a href=\"mailto:eviltrout@mailinator.com\">evil trout</a>");
-        });
       });
+
     });
+
+    describe("color", function() {
+
+      it("supports [color=] with a short hex value", function() {
+        expect(format("[color=#00f]blue[/color]")).toBe("<span style=\"color: #00f\">blue</span>");
+      });
+
+      it("supports [color=] with a long hex value", function() {
+        expect(format("[color=#ffff00]yellow[/color]")).toBe("<span style=\"color: #ffff00\">yellow</span>");
+      });
+
+      it("supports [color=] with an html color", function() {
+        expect(format("[color=red]red[/color]")).toBe("<span style=\"color: red\">red</span>");
+      });
+
+      it("it performs a noop on invalid input", function() {
+        expect(format("[color=javascript:alert('wat')]noop[/color]")).toBe("noop");
+      });
+
+    });
+
+    describe("tags with arguments", function() {
+
+      it("supports [size=]", function() {
+        expect(format("[size=35]BIG[/size]")).toBe("<span class=\"bbcode-size-35\">BIG</span>");
+      });
+
+      it("supports [url] with a title", function() {
+        expect(format("[url=http://bettercallsaul.com]better call![/url]")).toBe("<a href=\"http://bettercallsaul.com\">better call!</a>");
+      });
+
+      it("supports [email] with a title", function() {
+        expect(format("[email=eviltrout@mailinator.com]evil trout[/email]")).toBe("<a href=\"mailto:eviltrout@mailinator.com\">evil trout</a>");
+      });
+
+    });
+
+    describe("more complicated", function() {
+
+      it("can nest tags", function() {
+        expect(format("[u][i]abc[/i][/u]")).toBe("<span class='bbcode-u'><span class='bbcode-i'>abc</span></span>");
+      });
+
+      it("can bold two things on the same line", function() {
+        expect(format("[b]first[/b] [b]second[/b]")).toBe("<span class='bbcode-b'>first</span> <span class='bbcode-b'>second</span>");
+      });
+
+    });
+
+    describe("quoting", function() {
+
+      it("can quote", function() {
+        expect(format("[quote=\"eviltrout, post:1, topic:1\"]abc[/quote]", { lookupAvatar: false })).toBe("</p><aside class='quote' data-post=\"1\" data-topic=\"1\" >\n  <div class='title'>\n    <div class='quote-controls'></div>\n  \n  eviltrout\n  said:\n  </div>\n  <blockquote>abc</blockquote>\n</aside>\n<p>");
+      });
+
+      it("can nest quotes", function() {
+        expect(format("[quote=\"eviltrout, post:1, topic:1\"]abc[quote=\"eviltrout, post:2, topic:2\"]nested[/quote][/quote]", { lookupAvatar: false })).toBe("</p><aside class='quote' data-post=\"1\" data-topic=\"1\" >\n  <div class='title'>\n    <div class='quote-controls'></div>\n  \n  eviltrout\n  said:\n  </div>\n  <blockquote>abc</p><aside class='quote' data-post=\"2\" data-topic=\"2\" >\n  <div class='title'>\n    <div class='quote-controls'></div>\n  \n  eviltrout\n  said:\n  </div>\n  <blockquote>nested</blockquote>\n</aside>\n<p></blockquote>\n</aside>\n<p>");
+      });
+
+      it("can handle more than one quote", function() {
+        expect(format("before[quote=\"eviltrout, post:1, topic:1\"]first[/quote]middle[quote=\"eviltrout, post:2, topic:2\"]second[/quote]after", { lookupAvatar: false })).toBe("before</p><aside class='quote' data-post=\"1\" data-topic=\"1\" >\n  <div class='title'>\n    <div class='quote-controls'></div>\n  \n  eviltrout\n  said:\n  </div>\n  <blockquote>first</blockquote>\n</aside>\n<p>middle</p><aside class='quote' data-post=\"2\" data-topic=\"2\" >\n  <div class='title'>\n    <div class='quote-controls'></div>\n  \n  eviltrout\n  said:\n  </div>\n  <blockquote>second</blockquote>\n</aside>\n<p>after");
+      });
+
+    });
+
   });
 
+  describe('email environment', function() {
 
+    describe("simple tags", function() {
+
+      it("bolds text", function() {
+        expect(format("[b]strong[/b]", { environment: 'email' })).toBe("<b>strong</b>");
+      });
+
+      it("italics text", function() {
+        expect(format("[i]emphasis[/i]", { environment: 'email' })).toBe("<i>emphasis</i>");
+      });
+
+      it("underlines text", function() {
+        expect(format("[u]underlined[/u]", { environment: 'email' })).toBe("<u>underlined</u>");
+      });
+
+      it("strikes-through text", function() {
+        expect(format("[s]strikethrough[/s]", { environment: 'email' })).toBe("<s>strikethrough</s>");
+      });
+
+      it("makes code into pre", function() {
+        expect(format("[code]\nx++\n[/code]", { environment: 'email' })).toBe("<pre>\nx++\n</pre>");
+      });
+
+      it("supports spoiler tags", function() {
+        expect(format("[spoiler]it's a sled[/spoiler]", { environment: 'email' })).toBe("<span style='background-color: #000'>it's a sled</span>");
+      });
+
+      it("links images", function() {
+        expect(format("[img]http://eviltrout.com/eviltrout.png[/img]", { environment: 'email' })).toBe("<img src=\"http://eviltrout.com/eviltrout.png\">");
+      });
+
+      it("supports [url] without a title", function() {
+        expect(format("[url]http://bettercallsaul.com[/url]", { environment: 'email' })).toBe("<a href=\"http://bettercallsaul.com\">http://bettercallsaul.com</a>");
+      });
+
+      it("supports [email] without a title", function() {
+        expect(format("[email]eviltrout@mailinator.com[/email]", { environment: 'email' })).toBe("<a href=\"mailto:eviltrout@mailinator.com\">eviltrout@mailinator.com</a>");
+      });
+
+    });
+
+    describe("lists", function() {
+
+      it("creates an ul", function() {
+        expect(format("[ul][li]option one[/li][/ul]", { environment: 'email' })).toBe("<ul><li>option one</li></ul>");
+      });
+
+      it("creates an ol", function() {
+        expect(format("[ol][li]option one[/li][/ol]", { environment: 'email' })).toBe("<ol><li>option one</li></ol>");
+      });
+
+    });
+
+    describe("color", function() {
+
+      it("supports [color=] with a short hex value", function() {
+        expect(format("[color=#00f]blue[/color]", { environment: 'email' })).toBe("<span style=\"color: #00f\">blue</span>");
+      });
+
+      it("supports [color=] with a long hex value", function() {
+        expect(format("[color=#ffff00]yellow[/color]", { environment: 'email' })).toBe("<span style=\"color: #ffff00\">yellow</span>");
+      });
+
+      it("supports [color=] with an html color", function() {
+        expect(format("[color=red]red[/color]", { environment: 'email' })).toBe("<span style=\"color: red\">red</span>");
+      });
+
+      it("it performs a noop on invalid input", function() {
+        expect(format("[color=javascript:alert('wat')]noop[/color]", { environment: 'email' })).toBe("noop");
+      });
+
+    });
+
+    describe("tags with arguments", function() {
+
+      it("supports [size=]", function() {
+        expect(format("[size=35]BIG[/size]", { environment: 'email' })).toBe("<span style=\"font-size: 35px\">BIG</span>");
+      });
+
+      it("supports [url] with a title", function() {
+        expect(format("[url=http://bettercallsaul.com]better call![/url]", { environment: 'email' })).toBe("<a href=\"http://bettercallsaul.com\">better call!</a>");
+      });
+
+      it("supports [email] with a title", function() {
+        expect(format("[email=eviltrout@mailinator.com]evil trout[/email]", { environment: 'email' })).toBe("<a href=\"mailto:eviltrout@mailinator.com\">evil trout</a>");
+      });
+
+    });
+
+  });
+
+});

spec/phantom_js/smoke_test.js

@@ -91,7 +91,7 @@ var run = function(){
 
 page.runTests = function(){
 
-  test("more than one topic shows up", function() {
+  test("at least one topic shows up", function() {
     return $('#topic-list tbody tr').length > 0;
   });