diff options
| author | azul <azul@leap.se> | 2014-07-17 12:16:07 +0200 |
|---|---|---|
| committer | azul <azul@leap.se> | 2014-07-17 12:16:07 +0200 |
| commit | ade74d8a9091ae607586d7b287a0579a2ee7af8e (patch) | |
| tree | 74273b8ba7e35d0fb3c96aa79e63c93086d15146 /config | |
| parent | 952bc18e8333ca5c3e6e16f8059f84a1414d5f6f (diff) | |
| parent | e86cccb4b89540f3bd403110d051b2723be781b9 (diff) | |
Merge pull request #176 from azul/feature/api-authenticated-configs
API: Authenticated access to config settings
Diffstat (limited to 'config')
| -rw-r--r-- | config/cucumber.yml | 8 | ||||
| -rw-r--r-- | config/initializers/add_controller_methods.rb | 1 | ||||
| -rw-r--r-- | config/routes.rb | 1 |
3 files changed, 10 insertions, 0 deletions
diff --git a/config/cucumber.yml b/config/cucumber.yml new file mode 100644 index 0000000..19b288d --- /dev/null +++ b/config/cucumber.yml @@ -0,0 +1,8 @@ +<% +rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : "" +rerun_opts = rerun.to_s.strip.empty? ? "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}" +std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} --strict --tags ~@wip" +%> +default: <%= std_opts %> features +wip: --tags @wip:3 --wip features +rerun: <%= rerun_opts %> --format rerun --out rerun.txt --strict --tags ~@wip diff --git a/config/initializers/add_controller_methods.rb b/config/initializers/add_controller_methods.rb index 03e8393..f107544 100644 --- a/config/initializers/add_controller_methods.rb +++ b/config/initializers/add_controller_methods.rb @@ -2,4 +2,5 @@ ActiveSupport.on_load(:application_controller) do include ControllerExtension::Authentication include ControllerExtension::TokenAuthentication include ControllerExtension::Flash + include ControllerExtension::Errors end diff --git a/config/routes.rb b/config/routes.rb index 468e14e..3936824 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -35,6 +35,7 @@ LeapWeb::Application.routes.draw do resource :cert, :only => [:show, :create] resource :smtp_cert, :only => [:create] resource :service, :only => [:show] + resources :configs, :only => [:index, :show] end scope "(:locale)", :locale => MATCH_LOCALE do |