Skip to content

Commit

Permalink
[api] there is no point in testing 3 configurations
Browse files Browse the repository at this point in the history
There is no code that will look at more than the first configuration
  • Loading branch information
coolo committed Nov 12, 2012
1 parent b9ebd50 commit ea4841d
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 18 deletions.
8 changes: 4 additions & 4 deletions src/api/app/controllers/admin_controller.rb
Expand Up @@ -16,13 +16,13 @@ def killme
# of course we don't want to have this action visible
hide_action :startme unless Rails.env.test?
def startme
if @@started
render_ok
if @@started == true
render_ok
return
end
end
@@started = true
system("cd #{Rails.root.to_s}; unset BUNDLE_GEMFILE; RAILS_ENV=test exec bundle exec rake db:fixtures:load")
# for requests the ID is user visible, so reset it to get reproducible results
# for requests the ID is user visible, so reset it to get reproducible results
max=BsRequest.maximum(:id)
BsRequest.connection.execute("alter table bs_requests AUTO_INCREMENT = #{max+1}")
backend.direct_http(URI("/"))
Expand Down
14 changes: 1 addition & 13 deletions src/api/test/fixtures/configurations.yml
@@ -1,16 +1,4 @@
configurations_298486374:
id: 298486374
title: openSUSE Build Service
description: MyText
created_at: 2011-07-29 14:00:21.000000000 Z
updated_at: 2011-07-29 14:00:21.000000000 Z
configurations_980190962:
id: 980190962
title: My Open Build Service
description: MyText
created_at: 2011-07-29 14:00:21.000000000 Z
updated_at: 2011-07-29 14:00:21.000000000 Z
configurations_980190964:
seed:
id: 980190964
title: Open Build Service
description: ! " <p class=\"description\">\n The <a href=\"http://openbuildservice.org\">Open
Expand Down
2 changes: 1 addition & 1 deletion src/webui-testsuite/lib/OBSpages/MainPage.rb
Expand Up @@ -9,7 +9,7 @@ class MainPage < BuildServicePage
#
def validate_page
super
validate { @driver.page_source.include? "Welcome to openSUSE Build Service" }
validate { @driver.page_source.include? "Welcome to Open Build Service" }
end


Expand Down

0 comments on commit ea4841d

Please sign in to comment.