seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

VRFS-3681 removed git merge artifcats

This commit is contained in:
Jonathan Kolyer 2015-11-08 22:06:19 +00:00
parent 7fc646babe
commit 70f047dd3c
1 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
web/spec/controllers/api_jam_track_mixdowns_controller_spec.rb
View File

@ -24,11 +24,7 @@ describe ApiJamTrackMixdownsController, type: :controller do
json = JSON.parse(response.body)
json["next"].should be_nil
json["count"].should eq(1)
<<<<<<< HEAD
json["mixdowns"][0]["settings"].should eq({})
=======
json["mixdowns"][0]["settings"].should eq({"speed" => 5})
>>>>>>> develop
# and then add a package
package = FactoryGirl.create(:jam_track_mixdown_package, jam_track_mixdown: mixdown)
@ -45,11 +41,7 @@ describe ApiJamTrackMixdownsController, type: :controller do
describe "create" do
it "success" do
<<<<<<< HEAD
post :create, {:format => 'json', jamTrackID: jam_track.id, name: 'some name', description: 'some description', settings: {}}
=======
post :create, {:format => 'json', jamTrackID: jam_track.id, name: 'some name', description: 'some description', settings: {speed:5}}
>>>>>>> develop
response.status.should eq(200)
@ -57,20 +49,12 @@ describe ApiJamTrackMixdownsController, type: :controller do
json["name"].should eq('some name')
json["jam_track_id"].should eq(jam_track.id)
json["description"].should eq('some description')
<<<<<<< HEAD
json["settings"].should eq({})
=======
json["settings"].should eq({"speed" => 5})
>>>>>>> develop
json["packages"].should eq([])
end
it "validates name" do
<<<<<<< HEAD
post :create, {:format => 'json', jamTrackID: jam_track.id, description: 'some description', settings: {}}
=======
post :create, {:format => 'json', jamTrackID: jam_track.id, description: 'some description', settings: {speed:5}}
>>>>>>> develop
response.status.should eq(422)
@ -88,11 +72,7 @@ describe ApiJamTrackMixdownsController, type: :controller do
response.status.should eq(200)
json = JSON.parse(response.body)
<<<<<<< HEAD
json["message"].should eq("enqueued")
=======
puts json
>>>>>>> develop
json["id"].should_not be_nil
package = JamTrackMixdownPackage.find(json["id"])
@ -122,11 +102,8 @@ describe ApiJamTrackMixdownsController, type: :controller do
response.status.should eq(200)
json = JSON.parse(response.body)
<<<<<<< HEAD
json["message"].should eq("enqueued")
=======
puts json
>>>>>>> develop
json["id"].should eq(package.id)
JamTrackMixdownPackage.count.should eq(1)
end