Permalink
Browse files

Merge branch 'section_6_6' into section_6_7

  • Loading branch information...
2 parents 1f18928 + 21be893 commit b18f525ab3368df151d2028c77350fd0038df9e3 Noel Rappin committed Sep 30, 2012
Showing with 3 additions and 2 deletions.
  1. +2 −1 .gitignore
  2. +1 −1 spec/javascripts/autocompleteSpec.js
View
@@ -3,4 +3,5 @@ db/*.sqlite3
log/*.log
tmp/
.sass-cache/
-public/assets/
+public/assets/
+.idea
@@ -56,7 +56,7 @@ describe("Autocomplete widget", function() {
expect(this.ul.find("#user_activity_ids_element_1")).toHaveText("Alpha Delete");
expect(this.ul.find("#user_activity_ids_element_1 .delete-button")).toExist();
expect(this.ul.find("#user_activity_ids_element_3")).toHaveText("Gamma Delete");
- expect(this.ul.find("#user_activity_ids_element_1 .delete-button")).toExist();
+ expect(this.ul.find("#user_activity_ids_element_3 .delete-button")).toExist();
});
it("does not set up missing elements", function() {

0 comments on commit b18f525

Please sign in to comment.