From 9cb60566755c627cfdc6bc23d3052bb8e047b78c Mon Sep 17 00:00:00 2001
From: Vokhmin Alexey V <avokhmin@gmail.com>
Date: Wed, 19 Mar 2014 02:17:22 +0400
Subject: [PATCH] #345: updated build_lists_controller_spec

---
 .../projects/build_lists_controller_spec.rb   | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/spec/controllers/projects/build_lists_controller_spec.rb b/spec/controllers/projects/build_lists_controller_spec.rb
index 032e5b339..9a6e034e3 100644
--- a/spec/controllers/projects/build_lists_controller_spec.rb
+++ b/spec/controllers/projects/build_lists_controller_spec.rb
@@ -9,7 +9,7 @@ describe Projects::BuildListsController do
     end
 
     it 'should be able to perform index action in project scope' do
-      get :index, owner_name: @project.owner.uname, project_name: @project.name
+      get :index, owner_with_name: "#{@project.owner.uname}/#{@project.name}"
       response.should be_success
     end
   end
@@ -21,7 +21,7 @@ describe Projects::BuildListsController do
     end
 
     it 'should not be able to perform index action in project scope' do
-      get :index, owner_name: @project.owner.uname, project_name: @project.name
+      get :index, owner_with_name: "#{@project.owner.uname}/#{@project.name}"
       response.should redirect_to(forbidden_url)
     end
   end
@@ -32,32 +32,32 @@ describe Projects::BuildListsController do
     }
 
     it 'should be able to perform new action' do
-      get :new, owner_name: @project.owner.uname, project_name: @project.name
+      get :new, owner_with_name: "#{@project.owner.uname}/#{@project.name}"
       response.should render_template(:new)
     end
 
     it 'should be able to perform create action' do
-      post :create, {owner_name: @project.owner.uname, project_name: @project.name}.merge(@create_params)
+      post :create, {owner_with_name: "#{@project.owner.uname}/#{@project.name}"}.merge(@create_params)
       response.should redirect_to project_build_lists_path(@project)
     end
 
     it 'should save correct commit_hash for branch based build' do
-      post :create, {owner_name: @project.owner.uname, project_name: @project.name}.merge(@create_params).deep_merge(build_list: {project_version: "master"})
+      post :create, {owner_with_name: "#{@project.owner.uname}/#{@project.name}"}.merge(@create_params).deep_merge(build_list: {project_version: "master"})
       @project.build_lists.last.commit_hash.should == @project.repo.commits('master').first.id
     end
 
     it 'should save correct commit_hash for tag based build' do
       system("cd #{@project.repo.path} && git tag 4.7.5.3") # TODO REDO through grit
-      post :create, {owner_name: @project.owner.uname, project_name: @project.name}.merge(@create_params).deep_merge(build_list: {project_version: "4.7.5.3"})
+      post :create, {owner_with_name: "#{@project.owner.uname}/#{@project.name}"}.merge(@create_params).deep_merge(build_list: {project_version: "4.7.5.3"})
       @project.build_lists.last.commit_hash.should == @project.repo.commits('4.7.5.3').first.id
     end
 
     it 'should not be able to create with wrong project version' do
-      lambda{ post :create, {owner_name: @project.owner.uname, project_name: @project.name}.merge(@create_params).deep_merge(build_list: {project_version: "wrong", commit_hash: nil})}.should change{@project.build_lists.count}.by(0)
+      lambda{ post :create, {owner_with_name: "#{@project.owner.uname}/#{@project.name}"}.merge(@create_params).deep_merge(build_list: {project_version: "wrong", commit_hash: nil})}.should change{@project.build_lists.count}.by(0)
     end
 
     it 'should not be able to create with wrong git hash' do
-      lambda{ post :create, {owner_name: @project.owner.uname, project_name: @project.name}.merge(@create_params).deep_merge(build_list: {commit_hash: 'wrong'})}.should change{@project.build_lists.count}.by(0)
+      lambda{ post :create, {owner_with_name: "#{@project.owner.uname}/#{@project.name}"}.merge(@create_params).deep_merge(build_list: {commit_hash: 'wrong'})}.should change{@project.build_lists.count}.by(0)
     end
   end
 
@@ -67,12 +67,12 @@ describe Projects::BuildListsController do
     }
 
     it 'should not be able to perform new action' do
-      get :new, owner_name: @project.owner.uname, project_name: @project.name
+      get :new, owner_with_name: "#{@project.owner.uname}/#{@project.name}"
       response.should redirect_to(forbidden_url)
     end unless skip_new
 
     it 'should not be able to perform create action' do
-      post :create, {owner_name: @project.owner.uname, project_name: @project.name}.merge(@create_params)
+      post :create, {owner_with_name: "#{@project.owner.uname}/#{@project.name}"}.merge(@create_params)
       response.should redirect_to(forbidden_url)
     end
   end
@@ -119,7 +119,7 @@ describe Projects::BuildListsController do
 
         @user = FactoryGirl.create(:user)
         set_session_for(@user)
-        @show_params = {owner_name: @project.owner.uname, project_name: @project.name, id: @build_list.id}
+        @show_params = {owner_with_name: "#{@project.owner.uname}/#{@project.name}", id: @build_list.id}
         @build_list.save_to_repository.update_column(:publish_without_qa, false)
         @request.env['HTTP_REFERER'] = build_list_path(@build_list)
       end
@@ -315,7 +315,7 @@ describe Projects::BuildListsController do
         create_actor_relation(@member_group, @member_user, 'reader')
         create_relation(@project, @member_group, 'reader')
 
-        @show_params = {owner_name: @project.owner.uname, project_name: @project.name, id: @build_list.id}
+        @show_params = {owner_with_name: "#{@project.owner.uname}/#{@project.name}", id: @build_list.id}
       end
 
       context 'for all build lists' do