[api] mount the webui engine as /

- the default mimetype is application/xml if no Accept was given - everything not default and not XML will go to the webui engine - the rest stays in API (remove HTML namespace as unused and all_routes_test because it's just hiding missing coverage)
openSUSE · Oct 22, 2013 · 7ebdaf2 · 7ebdaf2
1 parent 832f9e8
commit 7ebdaf2
Show file tree

Hide file tree

Showing 25 changed files with 41 additions and 298 deletions.
diff --git a/src/api/Gemfile b/src/api/Gemfile
@@ -94,7 +94,6 @@ group :assets do
   gem 'sprite-factory', '>= 1.5.2'
   gem 'chunky_png'
 
-  gem "bootstrap-sass"
   gem 'jquery-rails'
   gem 'jquery-ui-rails'
 end

diff --git a/src/api/Gemfile.lock b/src/api/Gemfile.lock
@@ -34,8 +34,6 @@ GEM
     addressable (2.3.5)
     arel (4.0.0)
     atomic (1.1.14)
-    bootstrap-sass (2.3.2.2)
-      sass (~> 3.2)
     builder (3.1.4)
     capybara (2.0.3)
       mime-types (>= 1.16)
@@ -222,7 +220,6 @@ PLATFORMS
 
 DEPENDENCIES
   actionmailer
-  bootstrap-sass
   capybara (~> 2.0.1)
   capybara-webkit (< 1.0)
   capybara_minitest_spec

diff --git a/src/api/app/assets/javascripts/html/main.js b/src/api/app/assets/javascripts/html/main.js
diff --git a/src/api/app/assets/stylesheets/html/main.css.scss b/src/api/app/assets/stylesheets/html/main.css.scss
diff --git a/src/api/app/controllers/html/main_controller.rb b/src/api/app/controllers/html/main_controller.rb
diff --git a/src/api/app/controllers/person_controller.rb b/src/api/app/controllers/person_controller.rb
@@ -27,6 +27,10 @@ def command
     raise UnknownCommandError.new "Allowed commands are 'change_password'"
   end
 
+  def login
+    render_ok # just a dummy check for the webui to call (for now)
+  end
+
   def userinfo
     login = params[:login]
     user = User.find_by_login(login) if login

diff --git a/src/api/app/helpers/html/main_helper.rb b/src/api/app/helpers/html/main_helper.rb
diff --git a/src/api/app/views/html/main/index.html.erb b/src/api/app/views/html/main/index.html.erb
diff --git a/src/api/app/views/layouts/application.html.erb b/src/api/app/views/layouts/application.html.erb
diff --git a/src/api/config/initializers/wrap_parameters.rb b/src/api/config/initializers/wrap_parameters.rb
@@ -37,6 +37,7 @@ def call(env)
       env["action_dispatch.request.request_parameters"] = params
     end
 
+    env['HTTP_ACCEPT'] ||= 'application/xml'
     @app.call(env)
   end
 

diff --git a/src/api/config/routes.rb b/src/api/config/routes.rb
@@ -1,14 +1,6 @@
 OBSApi::Application.routes.draw do
 
-  mount Webui::Engine, at: "/webui2", as: 'webui_engine'
-
-  scope constraints: { format: 'html' } do
-    namespace :html do
-      get '/' => 'main#index'
-    end
-  end
-
-  defaults :format => 'xml' do
+  mount Webui::Engine, at: '/', as: 'webui_engine'
 
     get '/' => 'main#index'
 
@@ -20,6 +12,7 @@
     ### /person
     post 'person' => 'person#command'
     get 'person' => 'person#show'
+    post 'person/login/:user' => 'person#login'
 
     # FIXME3.0: this is no clean namespace, a person "register" or "changepasswd" could exist ...
     #           remove these for OBS 3.0
@@ -328,5 +321,4 @@
 
     get '/404' => 'main#notfound'
 
-  end
 end
diff --git a/src/api/test/controllers/html/main_controller_test.rb b/src/api/test/controllers/html/main_controller_test.rb
diff --git a/src/api/test/functional/configurations_controller_test.rb b/src/api/test/functional/configurations_controller_test.rb
@@ -19,10 +19,6 @@ def test_show_and_update_configuration
     put '/configuration', config
     assert_response 403 # Normal users can't change site-wide configuration
 
-    # the webui calls that
-    get '/configuration.json'
-    assert_response :success
-
     login_king # User with admin rights
     # webui is using this way to store data
     put '/configuration?title=openSUSE&description=blah_fasel&name=obsname'

diff --git a/src/api/test/functional/webui/all_routes_test.rb b/src/api/test/functional/webui/all_routes_test.rb
diff --git a/src/api/test/functional/webui/package_controller_test.rb b/src/api/test/functional/webui/package_controller_test.rb
@@ -67,13 +67,13 @@ def fill_comment
 
   test 'succesful comment creation' do
     login_Iggy
-    visit '/webui2/package/show/home:Iggy/TestPack'
+    visit webui_engine.root_path + '/package/show/home:Iggy/TestPack'
     fill_comment
   end
 
   test 'another succesful comment creation' do
     login_Iggy
-    visit '/webui2/package/show?project=home:Iggy&package=TestPack'
+    visit webui_engine.root_path + '/package/show?project=home:Iggy&package=TestPack'
     fill_comment
   end
 
@@ -86,20 +86,20 @@ def fill_comment
 
   test 'succesful reply comment creation' do
     login_Iggy
-    visit '/webui2/package/show/BaseDistro3/pack2'
+    visit webui_engine.root_path + '/package/show/BaseDistro3/pack2'
     find(:id,'reply_link_id_201').click
     fill_in 'reply_body_201', with: 'Comment Body'
     find(:id,'add_reply_201').click
     find('#flash-messages').must_have_text 'Comment added successfully '
    end
 
   test 'diff is empty' do
-    visit '/webui2/package/rdiff/BaseDistro2.0/pack2.linked?opackage=pack2&oproject=BaseDistro2.0'
+    visit webui_engine.root_path + '/package/rdiff/BaseDistro2.0/pack2.linked?opackage=pack2&oproject=BaseDistro2.0'
     find('#content').must_have_text 'No source changes!'
   end
 
   test 'revision is mepty' do
-    visit '/webui2/package/rdiff/BaseDistro2.0/pack2.linked?opackage=pack2&oproject=BaseDistro2.0&rev='
+    visit webui_engine.root_path + '/package/rdiff/BaseDistro2.0/pack2.linked?opackage=pack2&oproject=BaseDistro2.0&rev='
     flash_message_type.must_equal :alert
     flash_message.must_equal 'revision is empty'
   end