Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
ea5cee1
Bump nokogiri from 1.10.5 to 1.10.8
dependabot[bot] Feb 27, 2020
19ead50
Bump websocket-extensions from 0.1.4 to 0.1.5
dependabot[bot] Jun 6, 2020
cd08b95
Bump rack from 2.0.7 to 2.2.3
dependabot[bot] Jun 25, 2020
ed584a3
Merge pull request #73 from EngSwCIC/dependabot/bundler/rack-2.2.3
icaronr Sep 24, 2020
8d75616
Bump puma from 3.12.1 to 3.12.6
dependabot[bot] Sep 24, 2020
40a5769
Merge pull request #72 from EngSwCIC/dependabot/bundler/websocket-ext…
icaronr Sep 24, 2020
038a318
Merge pull request #74 from EngSwCIC/dependabot/bundler/puma-3.12.6
icaronr Sep 24, 2020
37d96d1
Merge pull request #69 from EngSwCIC/dependabot/bundler/nokogiri-1.10.8
icaronr Sep 24, 2020
14bfca1
Create sprint_1-Grupo_1.md
kdusousa Oct 28, 2020
395e30c
Adicionados primeiros testes com cucumber de capybara
yellak Oct 28, 2020
355a0fa
Adicionado primeiros testes da issue #37
MrJamesX37 Oct 28, 2020
0886ecf
Update nos testes
MrJamesX37 Oct 28, 2020
9a1e9cf
Delete add_person_on_activite_steps.rb
MrJamesX37 Oct 28, 2020
edce627
Delete add_person_on_a_activite.feature
MrJamesX37 Oct 28, 2020
be323ed
Update nos testes da issue #37
MrJamesX37 Oct 28, 2020
bf5f0bc
Criado cenário feliz e triste
MrJamesX37 Oct 29, 2020
8845839
Adicionado testes unitários da issue #37
MrJamesX37 Oct 29, 2020
68db750
Adicionados alguns testes e especificações de testes simples
yellak Oct 30, 2020
9a02ed7
Merge pull request #1 from kdusousa/36-testes-atividade
kdusousa Oct 30, 2020
957daa9
Create showInterestActivity
kdusousa Oct 30, 2020
b05191e
Rename showInterestActivity to showInterestActivity.feature
kdusousa Oct 30, 2020
b855574
Create showInterestActivity_steps.rb
kdusousa Oct 30, 2020
2236e52
Update showInterestActivity.feature
kdusousa Oct 30, 2020
189a173
Merge pull request #2 from kdusousa/37-teste-cadastro-em-atividade-in…
kdusousa Oct 30, 2020
3c9e22e
Create showInterestActivities_spec.rb
kdusousa Oct 30, 2020
a7a6421
Update sprint_1-Grupo_1.md
kdusousa Oct 30, 2020
4bc4927
features and step_definitions issue 38
estevamgalvao Oct 31, 2020
27f6ec5
Merge pull request #3 from kdusousa/38-notificacao
kdusousa Nov 1, 2020
7ee14fd
adjustments and rspec file
estevamgalvao Nov 1, 2020
5437c46
Merge pull request #4 from kdusousa/38-notificacao-rspec
estevamgalvao Nov 1, 2020
1fa1d66
Concertando erros que estavam dando no Cucumber
yellak Nov 10, 2020
36c705e
Merge pull request #6 from kdusousa/fix-erro-cucumber-button-box
kdusousa Nov 10, 2020
f0a25ea
Adicionar nova atividade - passando nos primeiros testes
yellak Nov 10, 2020
c8d3263
Fazendo todos os testes passar
yellak Nov 11, 2020
1116ba6
Merge pull request #8 from kdusousa/feature/adicionar-nova-atividade
MrJamesX37 Nov 11, 2020
53e4d61
Update showInterestActivity.feature
kdusousa Nov 13, 2020
ed35503
Update showInterestActivity_steps.rb
kdusousa Nov 13, 2020
6f43467
Fazendo os testes no rspec passarem
yellak Nov 13, 2020
9f37e36
Merge pull request #9 from kdusousa/feature/adicionar-nova-atividade
kdusousa Nov 13, 2020
7f03f53
Implementação feita
MrJamesX37 Nov 14, 2020
bca9bd0
Merge branch 'grupo1-sprint2-calendario-atividades' into feature/cada…
MrJamesX37 Nov 14, 2020
4e8c68f
Alguns ajustes feitos
MrJamesX37 Nov 14, 2020
042dc4c
Mais um detalhe ajustado
MrJamesX37 Nov 14, 2020
3995e90
Correções para os testes
yellak Nov 14, 2020
c6ef15a
Merge pull request #10 from kdusousa/feature/cadastro-em-atividade-in…
yellak Nov 14, 2020
1c4f898
Atualização do README
yellak Nov 14, 2020
38ac12f
Pequeno erro na UserActivity corrigido
MrJamesX37 Nov 14, 2020
bdfa207
Colocando edit.html.erb no diretório correto
MrJamesX37 Nov 14, 2020
307e75a
Delete edit.html.erb
MrJamesX37 Nov 14, 2020
50aaa8e
Colocando edit.html.erb no diretório certo
MrJamesX37 Nov 14, 2020
1adc947
Delete index.html.erb
MrJamesX37 Nov 14, 2020
38c5ad3
Atualizando index.html.erb
MrJamesX37 Nov 14, 2020
038f432
Delete user_activities_controller.rb
MrJamesX37 Nov 14, 2020
7278d37
Atualizando user_activities_controller.rb
MrJamesX37 Nov 14, 2020
6e45ae3
Update user_activities_controller.rb
MrJamesX37 Nov 14, 2020
b5595e0
Arrumando erros
MrJamesX37 Nov 14, 2020
65a035c
Arrumando erros
MrJamesX37 Nov 14, 2020
f18a598
Arrumando erros
MrJamesX37 Nov 14, 2020
351fd28
Arrumando erros
MrJamesX37 Nov 14, 2020
5890ced
Arrumando erros
MrJamesX37 Nov 14, 2020
b3330a5
Arrumando erros
MrJamesX37 Nov 14, 2020
f5a5aff
Arrumando erros
MrJamesX37 Nov 14, 2020
d499a2f
Arrumando erros
MrJamesX37 Nov 14, 2020
3eb4ddf
Merge pull request #11 from kdusousa/feature/cadastro-em-atividade-in…
yellak Nov 14, 2020
99c488b
all cucumber tests passed
estevamgalvao Nov 14, 2020
5d43d29
Merge branch 'grupo1-sprint2-calendario-atividades' into fearture/not…
estevamgalvao Nov 14, 2020
4f5abf8
Merge pull request #12 from kdusousa/fearture/notifyInterestedPeople
estevamgalvao Nov 14, 2020
3f5d319
update show Interest
Nov 29, 2020
a824e4d
Update README.md
kdusousa Dec 2, 2020
e298249
gemfile updated
Dec 2, 2020
b7e3b14
Merge branch 'grupo1-sprint3-calendario-atividades' of https://github…
Dec 2, 2020
9470332
update user_activities_controller
kdusousa Dec 2, 2020
12ec182
Added Saikuro results
yellak Dec 4, 2020
1020b01
Atualizando o README
yellak Dec 4, 2020
777bcfe
Merge pull request #13 from kdusousa/saikuro-refactoring
kdusousa Dec 4, 2020
0bb9df0
added Rubycritic
kdusousa Dec 4, 2020
5de157e
Merge branch 'grupo1-sprint3-calendario-atividades' of https://github…
kdusousa Dec 4, 2020
2907a0f
Update README.md
kdusousa Dec 4, 2020
843142c
Update README.md
kdusousa Dec 5, 2020
f3f102a
Update README.md
kdusousa Dec 5, 2020
d4677db
First SimpleCov test results
MrJamesX37 Dec 5, 2020
3199ff2
Atualizando README.md
MrJamesX37 Dec 5, 2020
c3bc1c1
Merge pull request #14 from kdusousa/simplecov-refactoring
kdusousa Dec 5, 2020
5e618d8
Delete sprint_1-Grupo_1.md
kdusousa Dec 5, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ gem 'rails', '~> 5.2.3'
# Use postgresql as the database for Active Record
gem 'pg', '>= 0.18', '< 2.0'
# Use Puma as the app server
gem 'puma', '~> 3.11'
gem 'puma', '~> 3.12'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
Expand Down Expand Up @@ -52,6 +52,7 @@ group :development do
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
gem 'spring-watcher-listen', '~> 2.0.0'
gem 'factory_bot_rails'
end

group :test do
Expand All @@ -64,7 +65,18 @@ group :test do
# database_cleaner is not required, but highly recommended
gem 'database_cleaner'
gem 'shoulda-matchers'
# Factory
gem 'factory_bot_rails'
gem 'rails-controller-testing'
gem 'simplecov', require: false
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

# Complexidade ciclomática
gem 'metric_fu-Saikuro'
# ABC Score
gem 'rubycritic'
# Rdoc
gem 'rdoc'
88 changes: 83 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ GEM
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
arel (9.0.0)
ast (2.4.1)
axiom-types (0.1.1)
descendants_tracker (~> 0.0.4)
ice_nine (~> 0.11.0)
thread_safe (~> 0.3, >= 0.3.1)
backports (3.15.0)
bcrypt (3.1.13)
bindex (0.8.1)
Expand All @@ -61,6 +66,8 @@ GEM
regexp_parser (~> 1.5)
xpath (~> 3.2)
childprocess (3.0.0)
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
coffee-rails (4.2.2)
coffee-script (>= 2.2.0)
railties (>= 4.0.0)
Expand Down Expand Up @@ -93,23 +100,46 @@ GEM
cucumber-tag_expressions (1.1.1)
cucumber-wire (0.0.1)
database_cleaner (1.7.0)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
devise (4.7.1)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0)
responders
warden (~> 1.2.3)
diff-lcs (1.3)
docile (1.3.2)
equalizer (0.0.11)
erubi (1.9.0)
erubis (2.7.0)
execjs (2.7.0)
factory_bot (6.1.0)
activesupport (>= 5.0.0)
factory_bot_rails (6.1.0)
factory_bot (~> 6.1.0)
railties (>= 5.0.0)
ffi (1.11.1)
flay (2.12.1)
erubis (~> 2.7.0)
path_expander (~> 1.0)
ruby_parser (~> 3.0)
sexp_processor (~> 4.0)
flog (4.6.4)
path_expander (~> 1.0)
ruby_parser (~> 3.1, > 3.1.0)
sexp_processor (~> 4.8)
gherkin (5.1.0)
globalid (0.4.2)
activesupport (>= 4.2.0)
i18n (1.7.0)
concurrent-ruby (~> 1.0)
ice_nine (0.11.2)
jbuilder (2.9.1)
activesupport (>= 4.2.0)
kwalify (0.7.2)
launchy (2.5.0)
addressable (~> 2.7)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
Expand All @@ -122,6 +152,7 @@ GEM
marcel (0.3.3)
mimemagic (~> 0.3.2)
method_source (0.9.2)
metric_fu-Saikuro (1.1.3)
mime-types (3.3)
mime-types-data (~> 3.2015)
mime-types-data (3.2019.1009)
Expand All @@ -133,13 +164,17 @@ GEM
multi_json (1.14.1)
multi_test (0.1.2)
nio4r (2.5.2)
nokogiri (1.10.5)
nokogiri (1.10.8)
mini_portile2 (~> 2.4.0)
orm_adapter (0.5.0)
parser (2.7.2.0)
ast (~> 2.4.1)
path_expander (1.1.0)
pg (1.1.4)
psych (3.2.0)
public_suffix (4.0.1)
puma (3.12.1)
rack (2.0.7)
puma (3.12.6)
rack (2.2.3)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.3)
Expand All @@ -155,6 +190,10 @@ GEM
bundler (>= 1.3.0)
railties (= 5.2.3)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
activesupport (>= 5.0.1.rc1)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
Expand All @@ -166,10 +205,17 @@ GEM
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rainbow (3.0.0)
rake (13.0.0)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
rdoc (6.2.1)
reek (6.0.2)
kwalify (~> 0.7.0)
parser (>= 2.5.0.0, < 2.8, != 2.5.1.1)
psych (~> 3.1)
rainbow (>= 2.0, < 4.0)
regexp_parser (1.6.0)
responders (3.0.0)
actionpack (>= 5.0)
Expand All @@ -192,6 +238,19 @@ GEM
rspec-support (~> 3.9.0)
rspec-support (3.9.0)
ruby_dep (1.5.0)
ruby_parser (3.15.0)
sexp_processor (~> 4.9)
rubycritic (4.5.2)
flay (~> 2.8)
flog (~> 4.4)
launchy (>= 2.0.0)
parser (>= 2.6.0)
rainbow (~> 3.0)
reek (~> 6.0, < 7.0)
ruby_parser (~> 3.8)
simplecov (>= 0.17.0)
tty-which (~> 0.4.0)
virtus (~> 1.0)
rubyzip (2.0.0)
sass (3.7.4)
sass-listen (~> 4.0.0)
Expand All @@ -207,8 +266,15 @@ GEM
selenium-webdriver (3.142.6)
childprocess (>= 0.5, < 4.0)
rubyzip (>= 1.2.2)
sexp_processor (4.15.1)
shoulda-matchers (4.1.2)
activesupport (>= 4.2.0)
simplecov (0.20.0)
docile (~> 1.1)
simplecov-html (~> 0.11)
simplecov_json_formatter (~> 0.1)
simplecov-html (0.12.3)
simplecov_json_formatter (0.1.2)
spring (2.1.0)
spring-watcher-listen (2.0.1)
listen (>= 2.7, < 4.0)
Expand All @@ -223,13 +289,19 @@ GEM
thor (0.20.3)
thread_safe (0.3.6)
tilt (2.0.10)
tty-which (0.4.2)
turbolinks (5.2.1)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.2.0)
execjs (>= 0.3.0, < 3)
virtus (1.0.5)
axiom-types (~> 0.1)
coercible (~> 1.0)
descendants_tracker (~> 0.0, >= 0.0.3)
equalizer (~> 0.0, >= 0.0.9)
warden (1.2.8)
rack (>= 2.0.6)
web-console (3.7.0)
Expand All @@ -243,7 +315,7 @@ GEM
selenium-webdriver (>= 3.0, < 4.0)
websocket-driver (0.7.1)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.4)
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)

Expand All @@ -258,15 +330,21 @@ DEPENDENCIES
cucumber-rails
database_cleaner
devise
factory_bot_rails
jbuilder (~> 2.5)
listen (>= 3.0.5, < 3.2)
metric_fu-Saikuro
pg (>= 0.18, < 2.0)
puma (~> 3.11)
puma (~> 3.12)
rails (~> 5.2.3)
rails-controller-testing
rdoc
rspec-rails
rubycritic
sass-rails (~> 5.0)
selenium-webdriver
shoulda-matchers
simplecov
spring
spring-watcher-listen (~> 2.0.0)
turbolinks (~> 5)
Expand Down
69 changes: 45 additions & 24 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,24 +1,45 @@
# README

This README would normally document whatever steps are necessary to get the
application up and running.

Things you may want to cover:

* Ruby version

* System dependencies

* Configuration

* Database creation

* Database initialization

* How to run the test suite

* Services (job queues, cache servers, search engines, etc.)

* Deployment instructions

* ...
## GRUPO 1 - Sprint 3

* Carlos Eduardo de Sousa - 160057701
* Edilton Costa Alves - 170002365
* Eduardo Vaz Fagundes Rech - 180075161
* Estevam Galvão Albuquerque - 160005663
* Kalley Wilkerson Rodrigues Alexandre - 170038050

&nbsp;
## NOME DO PROJETO
#### Calendário de atividades - secretaria-ppgi
&nbsp;
## Papéis na Sprint

#### Kálley - 170038050
* Refatoração utilizando o Saikuro
#### Carlos Eduardo - 160057701
* Rubycritic (tmp/rubycritic/)

### Eduardo - 180075161
* Refatoração utilizando o SimpleCov

&nbsp;
## ATRIBUIÇÕES

#### Scrum Master
* Carlos Eduardo de Sousa - 160057701

#### Product Owner
* Edilton Costa Alves - 170002365

&nbsp;
## Resultados para a Sprint 3
&nbsp;
| | Antes da refatoração | Depois da refatoração |
| ------ | ------------------------------ | ---------------------- |
| Code 1 | | |
| Code 2 | | |
| Code 3 | | |

### Saikuro
As tabelas geradas pelo Saikuro estão nas pastas **app/controllers/saikuro** e **app/models/saikuro**. Não foi preciso mudar o código pois os resultados do Saikuro já eram satisfatórios

### SimpleCov
A tabela gerada pelo SimpleCov está na pasta **coverage**.
3 changes: 3 additions & 0 deletions app/assets/javascripts/user_activities.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/stylesheets/user_activities.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Place all the styles related to the UserActivity controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
41 changes: 41 additions & 0 deletions app/controllers/activities_controller.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
class ActivitiesController < ApplicationController
def index
@activities = Activity.all
end

def new
end

def create
@activity = Activity.new(activity_params)
if @activity.save
flash[:notice] = "Atividade cadastrada com sucesso."
redirect_to activities_path
elsif @activity.errors.any?
flash[:notice] = ["Atividade não cadastrada."]
@activity.errors.each do |attribute, message|
flash[:notice] << message
end
redirect_back(fallback_location: new_activity_path)
end
end

def destroy
@activity = Activity.find(params[:id])
if @activity.destroy
flash[:notice] = "Atividade deleteda com sucesso."
redirect_to activities_path
elsif @activity.errors.any?
flash[:notice] = ["Não foi possível deletar a Atividade."]
@activity.errors.each do |attribute, message|
flash[:notice] << message
end
redirect_back(fallback_location: root_path)
end
end

private
def activity_params
params.fetch(:activity, {}).permit(:title, :due_date)
end
end
6 changes: 6 additions & 0 deletions app/controllers/notifications_controller.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
class NotificationsController < ApplicationController
def create
flash[:notice] = "Notificação enviada aos interessados com sucesso."
redirect_to activities_path
end
end
Loading