From 9df947097f88f57cb5242774a020b4e6a3643757 Mon Sep 17 00:00:00 2001 From: Jonathan Kolyer Date: Sun, 8 Nov 2015 23:05:34 +0000 Subject: [PATCH] VRFS-3681 develop branch merge review --- web/app/views/clients/_help.html.slim | 2 +- web/spec/controllers/api_jam_track_mixdowns_controller_spec.rb | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/web/app/views/clients/_help.html.slim b/web/app/views/clients/_help.html.slim index a05979179..ba3dc8ceb 100644 --- a/web/app/views/clients/_help.html.slim +++ b/web/app/views/clients/_help.html.slim @@ -367,4 +367,4 @@ script type="text/template" id="template-help-vid-record-chat-input" script type="text/template" id="template-help-first-time-jamtrack-web-player" .first-time-jamtrack-web-player - | Create custom mixes to mute parts, slow down playback, etc. + | Create custom mixes to mute parts, slow down playback, etc. \ No newline at end of file diff --git a/web/spec/controllers/api_jam_track_mixdowns_controller_spec.rb b/web/spec/controllers/api_jam_track_mixdowns_controller_spec.rb index 759882ebb..7f36ea02e 100644 --- a/web/spec/controllers/api_jam_track_mixdowns_controller_spec.rb +++ b/web/spec/controllers/api_jam_track_mixdowns_controller_spec.rb @@ -103,7 +103,6 @@ describe ApiJamTrackMixdownsController, type: :controller do json = JSON.parse(response.body) puts json - json["id"].should eq(package.id) JamTrackMixdownPackage.count.should eq(1) end