"));
+ });
+
it("renders app.pages.GettingStarted", function() {
app.router.navigate("/getting_started", {trigger: true});
- expect(app.page.$el.selector).toEqual("#hello-there");
+ expect(app.page.$el.is($("#hello-there"))).toBe(true);
});
it("renders app.pages.GettingStarted when the URL has a trailing slash", function() {
app.router.navigate("/getting_started/", {trigger: true});
- expect(app.page.$el.selector).toEqual("#hello-there");
+ expect(app.page.$el.is($("#hello-there"))).toBe(true);
});
});
diff --git a/spec/javascripts/app/views/publisher_mention_view_spec.js b/spec/javascripts/app/views/publisher_mention_view_spec.js
index 5f53c110f..15371a01f 100644
--- a/spec/javascripts/app/views/publisher_mention_view_spec.js
+++ b/spec/javascripts/app/views/publisher_mention_view_spec.js
@@ -15,7 +15,7 @@ describe("app.views.PublisherMention", function() {
this.view = new app.views.PublisherMention({ el: "#publisher" });
expect(app.views.SearchBase.prototype.initialize).toHaveBeenCalled();
var call = app.views.SearchBase.prototype.initialize.calls.mostRecent();
- expect(call.args[0].typeaheadInput.selector).toBe("#publisher .typeahead-mention-box");
+ expect(call.args[0].typeaheadInput.is($("#publisher .typeahead-mention-box"))).toBe(true);
expect(call.args[0].customSearch).toBeTruthy();
expect(call.args[0].autoselect).toBeTruthy();
expect(call.args[0].remoteRoute).toEqual({url: "/contacts"});
diff --git a/spec/javascripts/app/views/publisher_view_spec.js b/spec/javascripts/app/views/publisher_view_spec.js
index e540669b6..8d02015ea 100644
--- a/spec/javascripts/app/views/publisher_view_spec.js
+++ b/spec/javascripts/app/views/publisher_view_spec.js
@@ -591,7 +591,7 @@ describe("app.views.Publisher", function() {
});
context('photo removal', function() {
- beforeEach(function() {
+ beforeEach(function(done) {
this.view = new app.views.Publisher();
this.view.wrapperEl.addClass("with_attachments");
this.view.photozoneEl.html(
@@ -603,6 +603,7 @@ describe("app.views.Publisher", function() {
);
spyOn(jQuery, 'ajax').and.callFake(function(opts) { opts.success(); });
+ this.view.viewUploader.on("change", done);
this.view.photozoneEl.find(".x").click();
});
diff --git a/spec/javascripts/app/views/search_view_spec.js b/spec/javascripts/app/views/search_view_spec.js
index ffb652304..fe93aa651 100644
--- a/spec/javascripts/app/views/search_view_spec.js
+++ b/spec/javascripts/app/views/search_view_spec.js
@@ -10,7 +10,7 @@ describe("app.views.Search", function() {
spyOn(app.views.SearchBase.prototype, "initialize");
this.view = new app.views.Search({el: "#search_people_form"});
var call = app.views.SearchBase.prototype.initialize.calls.mostRecent();
- expect(call.args[0].typeaheadInput.selector).toBe("#search_people_form #q");
+ expect(call.args[0].typeaheadInput.is($("#search_people_form #q"))).toBe(true);
expect(call.args[0].remoteRoute).toEqual({url: "/search"});
});
diff --git a/spec/javascripts/app/views_spec.js b/spec/javascripts/app/views_spec.js
index 6992f0372..84c912d15 100644
--- a/spec/javascripts/app/views_spec.js
+++ b/spec/javascripts/app/views_spec.js
@@ -119,42 +119,49 @@ describe("app.views.Base", function(){
context("calling out to third party plugins", function() {
it("replaces .time with relative time ago in words", function() {
+ this.view.templateName = false;
spyOn($.fn, "timeago");
+ this.view.$el.append("
");
this.view.render();
expect($.fn.timeago).toHaveBeenCalled();
- expect($.fn.timeago.calls.mostRecent().object.selector).toBe("time");
+ expect($.fn.timeago.calls.mostRecent().object.first().is("time")).toBe(true);
});
it("initializes tooltips declared with the view's tooltipSelector property", function(){
+ this.view.templateName = false;
this.view.tooltipSelector = ".christopher_columbus, .barrack_obama, .block_user";
+ this.view.$el.append("
");
spyOn($.fn, "tooltip");
this.view.render();
- expect($.fn.tooltip.calls.mostRecent().object.selector).toBe(".christopher_columbus, .barrack_obama, .block_user");
- });
-
- it("applies infield labels", function(){
- spyOn($.fn, "placeholder");
- this.view.render();
- expect($.fn.placeholder).toHaveBeenCalled();
- expect($.fn.placeholder.calls.mostRecent().object.selector).toBe("input, textarea");
+ expect(
+ $.fn.tooltip.calls.mostRecent().object.is(".christopher_columbus, .barrack_obama, .block_user")
+ ).toBe(true);
});
});
});
describe("#renderTemplate", function(){
+ beforeEach(function() {
+ this.view.$el.htmlOriginal = this.view.$el.html;
+ spyOn(this.view.$el, "html").and.callFake(function() {
+ this.htmlOriginal("
");
+ return this;
+ });
+ });
+
it("calls jQuery.placeholder() for inputs", function() {
spyOn($.fn, "placeholder");
this.view.renderTemplate();
expect($.fn.placeholder).toHaveBeenCalled();
- expect($.fn.placeholder.calls.mostRecent().object.selector).toBe("input, textarea");
+ expect($.fn.placeholder.calls.mostRecent().object.is("input, textarea")).toBe(true);
});
it("initializes autosize for textareas", function(){
spyOn(window, "autosize");
this.view.renderTemplate();
expect(window.autosize).toHaveBeenCalled();
- expect(window.autosize.calls.mostRecent().args[0].selector).toBe("textarea");
+ expect(window.autosize.calls.mostRecent().args[0].is("textarea")).toBe(true);
});
});
});
diff --git a/spec/javascripts/mobile/mobile_application_spec.js b/spec/javascripts/mobile/mobile_application_spec.js
index 3b6ecc4c9..c5a301551 100644
--- a/spec/javascripts/mobile/mobile_application_spec.js
+++ b/spec/javascripts/mobile/mobile_application_spec.js
@@ -8,7 +8,7 @@ describe("Diaspora.Mobile", function(){
it("calls autosize for textareas", function(){
Diaspora.Mobile.initialize();
expect(window.autosize).toHaveBeenCalled();
- expect(window.autosize.calls.mostRecent().args[0].selector).toBe("textarea");
+ expect(window.autosize.calls.mostRecent().args[0].is($("textarea"))).toBe(true);
});
it("deactivates shield", function(){