From 3b33b5eae77e40353434be8858b06d4d087e2d24 Mon Sep 17 00:00:00 2001
From: Henne Vogelsang <hvogel@opensuse.org>
Date: Wed, 19 Feb 2014 16:02:24 +0100
Subject: [PATCH] [webui] Add a backend package to the delete_commented* tests

---
 src/api/app/controllers/webui/project_controller.rb |  2 +-
 src/api/script/start_test_backend                   |  1 +
 src/api/test/fixtures/backend_packages.yml          |  7 +++++++
 src/api/test/functional/comments_controller_test.rb | 12 ++++++------
 src/api/test/functional/webui/messages_test.rb      | 12 +-----------
 5 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/api/app/controllers/webui/project_controller.rb b/src/api/app/controllers/webui/project_controller.rb
index bb771d8ee16..9f7bfc51200 100644
--- a/src/api/app/controllers/webui/project_controller.rb
+++ b/src/api/app/controllers/webui/project_controller.rb
@@ -884,7 +884,7 @@ def monitor
 
     @buildresult = Buildresult.find( find_opt )
     unless @buildresult
-      flash[:error] = "No build results for project '#{@project}'"
+      flash[:warning] = "No build results for project '#{@project}'"
       redirect_to :action => :show, :project => params[:project]
       return
     end
diff --git a/src/api/script/start_test_backend b/src/api/script/start_test_backend
index 34d3137d3a1..90eeb6ab640 100755
--- a/src/api/script/start_test_backend
+++ b/src/api/script/start_test_backend
@@ -245,6 +245,7 @@ Suse::Backend.put('/source/home:Iggy:branches:kde4/BranchPack/myfile?user=king',
 Suse::Backend.put('/source/kde4/kdebase/myfile2?user=king', 'DummyContent')
 Suse::Backend.put('/source/kde4/kdelibs/my_patch.diff?user=king', 'argl')
 Suse::Backend.put('/source/home:dmayr/x11vnc/README?user=king', 'just to delete')
+Suse::Backend.put('/source/home:king/_config?user=king', 'Type: spec')
 
 # manual placing of files
 FileUtils.cp("#{Rails.root}/test/fixtures/backend/source/_pubkey", "#{Rails.root}/tmp/backend_data/projects/BaseDistro.pkg/_pubkey")
diff --git a/src/api/test/fixtures/backend_packages.yml b/src/api/test/fixtures/backend_packages.yml
index cba063de9cf..6da0038d263 100644
--- a/src/api/test/fixtures/backend_packages.yml
+++ b/src/api/test/fixtures/backend_packages.yml
@@ -198,3 +198,10 @@ kde4_kdelibs:
   expandedmd5: 1636661d96a88cd985d82dc611ebd723
   maxmtime: 2013-09-30 15:50:37.000000000 Z
   package: kde4_kdelibs
+home_king_commentpack:
+  updated_at: 2013-09-30 15:50:41.000000000 Z
+  srcmd5: d41d8cd98f00b204e9800998ecf8427e
+  verifymd5: d41d8cd98f00b204e9800998ecf8427e
+  expandedmd5: d41d8cd98f00b204e9800998ecf8427e
+  maxmtime: 2013-09-30 15:50:37.000000000 Z
+  package: home_king_commentpack
diff --git a/src/api/test/functional/comments_controller_test.rb b/src/api/test/functional/comments_controller_test.rb
index abf3461cd2d..9b75d31d353 100644
--- a/src/api/test/functional/comments_controller_test.rb
+++ b/src/api/test/functional/comments_controller_test.rb
@@ -53,17 +53,17 @@ class CommentsControllerTest < ActionDispatch::IntegrationTest
 
   end
 
-  test 'delete commented project' do
-    # BaseDistro has comments
+  test 'delete commented package' do
+    # home:king/commentpack has comments
     login_king
-    delete '/source/home:king'
+    delete '/source/home:king/commentpack'
     assert_response :success
   end
 
-  test 'delete commented package' do
-    # BaseDistro3/pack2 has comments
+  test 'delete commented project' do
+    # home:king has comments
     login_king
-    delete '/source/home:king/commentpack'
+    delete '/source/home:king'
     assert_response :success
   end
 
diff --git a/src/api/test/functional/webui/messages_test.rb b/src/api/test/functional/webui/messages_test.rb
index c013bbbf146..75263ecdca2 100644
--- a/src/api/test/functional/webui/messages_test.rb
+++ b/src/api/test/functional/webui/messages_test.rb
@@ -5,13 +5,9 @@ class Webui::MessagesTest < Webui::IntegrationTest
   test 'add and remove message' do
     use_js
 
-    login_king to: project_show_path(project: 'home:king')
-
-    # create admin's home to avoid interconnect
-    find_button('Create Project').click
+    login_king to: root_path 
 
     message = 'This is just a test'
-    visit root_path
     page.wont_have_selector('#news-message')
 
     find(:id, 'add-new-message').click
@@ -36,12 +32,6 @@ class Webui::MessagesTest < Webui::IntegrationTest
     # check that it's gone
     page.wont_have_selector('#news-message')
     
-    # and now to something completely different - we need to erase home:king
-    # again so that you still get the same interconnect s*** workflow (TODO!!!)
-    visit project_show_path(project: 'home:king')
-    find(:id, 'delete-project').click
-    find_button('Ok').click
-
   end
 
 end