Commit bc747a43458f70c7e4a1aa95dbe7e1d197380197
Committed by
Fabio Teixeira
Fabio Teixeira
1 parent
52a816c0
Exists in
master
and in
3 other branches
Fix plugin tests
Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com> Signed-off-by: Thiago Ribeiro <thiagitosouza@hotmail.com>
Showing
4 changed files
with
37 additions
and
3 deletions
Show diff stats
controllers/gov_user_plugin_controller.rb
| @@ -123,6 +123,15 @@ class GovUserPluginController < ApplicationController | @@ -123,6 +123,15 @@ class GovUserPluginController < ApplicationController | ||
| 123 | 123 | ||
| 124 | protected | 124 | protected |
| 125 | 125 | ||
| 126 | + def get_model_by_params_field | ||
| 127 | + case params[:field] | ||
| 128 | + when "software_language" | ||
| 129 | + return ProgrammingLanguage | ||
| 130 | + else | ||
| 131 | + return DatabaseDescription | ||
| 132 | + end | ||
| 133 | + end | ||
| 134 | + | ||
| 126 | def get_state_list | 135 | def get_state_list |
| 127 | NationalRegion.find( | 136 | NationalRegion.find( |
| 128 | :all, | 137 | :all, |
features/steps_definitions/gov_user_steps.rb
| @@ -44,7 +44,6 @@ page.driver.browser.execute_script %Q{ | @@ -44,7 +44,6 @@ page.driver.browser.execute_script %Q{ | ||
| 44 | sleep 1 | 44 | sleep 1 |
| 45 | end | 45 | end |
| 46 | 46 | ||
| 47 | - | ||
| 48 | Given /^the following public institutions?$/ do |table| | 47 | Given /^the following public institutions?$/ do |table| |
| 49 | # table is a Cucumber::Ast::Table | 48 | # table is a Cucumber::Ast::Table |
| 50 | table.hashes.each do |item| | 49 | table.hashes.each do |item| |
| @@ -66,3 +65,26 @@ Given /^the following public institutions?$/ do |table| | @@ -66,3 +65,26 @@ Given /^the following public institutions?$/ do |table| | ||
| 66 | institution.save! | 65 | institution.save! |
| 67 | end | 66 | end |
| 68 | end | 67 | end |
| 68 | + | ||
| 69 | + | ||
| 70 | +Given /^I sleep for (\d+) seconds$/ do |time| | ||
| 71 | + sleep time.to_i | ||
| 72 | +end | ||
| 73 | + | ||
| 74 | +Given /^I am logged in as mpog_admin$/ do | ||
| 75 | + visit('/account/logout') | ||
| 76 | + | ||
| 77 | + user = User.new(:login => 'admin_user', :password => '123456', :password_confirmation => '123456', :email => 'admin_user@example.com') | ||
| 78 | + person = Person.new :name=>"Mpog Admin", :identifier=>"mpog-admin" | ||
| 79 | + user.person = person | ||
| 80 | + user.save! | ||
| 81 | + | ||
| 82 | + user.activate | ||
| 83 | + e = Environment.default | ||
| 84 | + e.add_admin(user.person) | ||
| 85 | + | ||
| 86 | + visit('/account/login') | ||
| 87 | + fill_in("Username", :with => user.login) | ||
| 88 | + fill_in("Password", :with => '123456') | ||
| 89 | + click_button("Log in") | ||
| 90 | +end | ||
| 69 | \ No newline at end of file | 91 | \ No newline at end of file |
test/functional/gov_user_plugin_controller_test.rb
| @@ -190,9 +190,12 @@ class GovUserPluginControllerTest < ActionController::TestCase | @@ -190,9 +190,12 @@ class GovUserPluginControllerTest < ActionController::TestCase | ||
| 190 | ) | 190 | ) |
| 191 | fields[:institutions][:acronym] = "SPI" | 191 | fields[:institutions][:acronym] = "SPI" |
| 192 | 192 | ||
| 193 | + fields[:action] = "new_institution" | ||
| 194 | + fields[:controller] ="gov_user_plugin" | ||
| 195 | + | ||
| 193 | post :new_institution, fields | 196 | post :new_institution, fields |
| 194 | 197 | ||
| 195 | - assert_redirected_to(controller: "software_communities_plugin", action: "create_institution_admin") | 198 | + assert_redirected_to(controller: "gov_user_plugin", action: "create_institution_admin", params: fields) |
| 196 | end | 199 | end |
| 197 | 200 | ||
| 198 | should "Create foreign institution without city, state and cnpj by post" do | 201 | should "Create foreign institution without city, state and cnpj by post" do |
test/helpers/plugin_test_helper.rb
| @@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../helpers/institution_test_helper' | @@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../helpers/institution_test_helper' | ||
| 2 | 2 | ||
| 3 | module PluginTestHelper | 3 | module PluginTestHelper |
| 4 | 4 | ||
| 5 | - def create_person name, email, password, password_confirmation, secondary_email, state, city | 5 | + def create_person name, email, password, password_confirmation, secondary_email, state="state", city="city" |
| 6 | user = create_user( | 6 | user = create_user( |
| 7 | name.to_slug, | 7 | name.to_slug, |
| 8 | email, | 8 | email, |