[dist] reenable the api test suite

openSUSE · Nov 29, 2012 · 302347d · 302347d
1 parent c7bbc06
commit 302347d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,10 +5,10 @@ before_script: bash -x dist/ci/obs_testsuite_travis_before.sh
 script: bash -x dist/ci/obs_testsuite_travis.sh
 env:
   # just one special test
-  - SUBTEST=webui:functional/users_test.rb:test_add_and_edit_package_people
+  #- SUBTEST=webui:functional/users_test.rb:test_add_and_edit_package_people
   #- SUBTEST=api:functional/source_controller_test.rb:test_read_file REMOVEGEMLOCK=true
   # full api test suite
-  #- SUBTEST=api
+  - SUBTEST=api
   # full webrat test suite
   - SUBTEST=webui
   # selenium without spider

diff --git a/dist/ci/obs_testsuite_travis.sh b/dist/ci/obs_testsuite_travis.sh
@@ -53,6 +53,7 @@ case $SUBTEST in
    thetest=${SUBTEST/:*/}
    thename=${SUBTEST/*:/}
    if ! bundle exec ruby test/$thetest --name=$thename ; then
+     ret=1
      cat log/test.log
    fi
    ;;

diff --git a/src/webui/app/views/shared/_involved_users.html.erb b/src/webui/app/views/shared/_involved_users.html.erb
@@ -21,12 +21,12 @@
       </thead>
       <tbody>
         <% @users.each do |user| %>
-  	<tr id='user-<%= valid_xml_id(user) %>'>
+  	<tr id='user-<%= valid_xml_id(user.login) %>'>
             <td><%= render :partial => 'shared/user_with_realname_and_icon', :locals => {:user => user.login }%></td>
             <% @roles.each do |role| %>
-              <%= content_tag(:td, data: { user: user, role: role, type: 'user' }) do %>
+              <%= content_tag(:td, data: { user: user.login, role: role, type: 'user' }) do %>
                 <% if defined? @package %>
-                  <%= check_box_tag("user_" + role + "_" + user, '',
+                  <%= check_box_tag("user_" + role + "_" + user.login, '',
                       @package.user_has_role?(user, role), 
 		      disabled: !user_is_maintainer, class: "trigger") %>
                   <% if @project.user_has_role?(user, role) %>