major restructuring/refactoring of application.js. finally scratched that itch. Some tests are failing to be fixed later.

features/notes_manage.feature

@@ -22,6 +22,12 @@ Feature: View, add, remove notes
     And I should see note "My Note A" on the notes page
     Then the badge should show 1
 
+  Scenario: Link to note
+    Given I have a project "Pass Final Exam" with 1 note
+    When I visit the "Pass Final Exam" project
+    And I click the icon next to the note
+    Then I should see the note text
+
   @selenium
   Scenario: Delete note from notes page
     Given I have a project "Pass Final Exam" with 2 notes
@@ -30,16 +36,9 @@ Feature: View, add, remove notes
     Then the first note should disappear
     And the badge should show 1
 
-  @selenium
-  Scenario: Link to note
-    Given I have a project "Pass Final Exam" with 1 note
-    When I visit the "Pass Final Exam" project
-    And I click the icon next to the note
-    Then I should see the note text
-
   @selenium
   Scenario: Edit a note
     Given I have a project "Pass Final Exam" with 2 notes
     When I go to the notes page
     And I edit the first note to "edited note"
-    Then I should see "edited note"
+    Then I should see "edited note"

features/show_integration_options.feature

@@ -21,7 +21,6 @@ Feature: Integrate Tracks in various ways
     Then I should see a message that you need a context to see scripts
 
   Scenario: I can see scripts when I have one or more contexts
-    Given I have a context called "@pc"
     When I go to the integrations page
     Then I should see scripts
 

features/step_definitions/login_steps.rb

@@ -7,7 +7,7 @@ Given /^I have logged in as "(.*)" with password "(.*)"$/ do |username, password
   if response.respond_to? :selenium
     selenium.wait_for_page_to_load(5000)
   end
-  response.should contain(/Login successful/)
+  response.should contain(/Logout \(#{username}\)/)
   @current_user = User.find_by_login(username)
 end