Merge branch 'master' of https://github.com/joaovlm/rgms

Conflicts:
	COMANDO GEBS
	test/cucumber/Dissertacao.feature
	test/cucumber/steps/DissertacaoSteps.groovy
	test/functional/steps/TestDataAndOperations.groovy

COMANDO GEBS

@@ -1 +1 @@
--Dgeb.env=chrome -Dwebdriver.chrome.driver=/Users/Rodrigo/Documents/workspaces/TAES/gitsource/rgms/chromedrivers/chromedrivermac test-app functional:cucumber
+-Dgeb.env=chrome -Dwebdriver.chrome.driver=/Users/Rodrigo/Documents/workspaces/TAES/gitsource/rgms/chromedrivers/chromedrivermac test-app functional:cucumber

test/cucumber/Dissertacao.feature

@@ -32,6 +32,15 @@ Feature: Dissertation Tests
     When I create the dissertation "Dissertation duplicated" with file name "Dissertationduplicated2.txt" and school "UFPE"
     Then the dissertation "Dissertation duplicated" is not stored twice
 
+  Scenario:  first dissertation and delete
+    Given the system has no dissertation stored
+    When I create the dissertation "New dissertation" with file name "dissertation.txt" and school "federal"
+    And I am at the publications menu
+    And I select the "Dissertacao" option at the program menu
+    And I select "Delete dissertation" at the dissertation page
+    And I delete "New dissertation"
+    Then the system has no dissertation stored
+
   Scenario: new dissertation without file
     Given I am at the publications menu
     When I select the "Dissertacao" option at the program menu
@@ -52,7 +61,7 @@ Feature: Dissertation Tests
     Then the system has a dissertation entitled "Dissertacao Teste 1"
 
   Scenario: edit dissertation
-    Given the dissertation "Edit dissertation" is stored in the system with file name "Editdissertation.txt"
+    Given the dissertation "Edit dissertation" is stored in the system with file name "Editdissertation.txt", has no dissertation entitled "Edit dissertation reviewed"
     Given the system has no dissertation entitled "Edit dissertation reviewed"
     When    I edit the dissertation title from "Edit dissertation" to "Edit dissertation reviewed"
     Then    the dissertation "Edit dissertation" is properly updated by the system
@@ -72,7 +81,7 @@ Feature: Dissertation Tests
     Then I'm still on dissertation page
 
   Scenario: upload dissertation with a file
-    Given the system has some dissertation stored
+    Given the system has some dissertation stored, has no dissertation entitled "New dissertation"
     Given the system has no dissertation entitled "New dissertation"
     When I upload a new dissertation "curriculo.xml" with title "New dissertation"
     Then the system has more dissertations now
@@ -81,7 +90,7 @@ Feature: Dissertation Tests
     Given the system has no dissertation entitled "New dissertation"
     When I upload a new dissertation "curriculo.xml" with title "New dissertation"
     Then the system has more dissertations now
-
+    
   Scenario:  first dissertation and delete
     Given the system has no dissertation stored
     When I create the dissertation "New dissertation" with file name "dissertation.txt" and school "federal"

test/cucumber/steps/DissertacaoSteps.groovy

@@ -143,6 +143,20 @@ When(~'^I upload a new dissertation "([^"]*)" with title "([^"]*)"$') {  filenam
     // não consegui fazer de uma maneira que todos os passos sejam independentes
 }
 
+    assert inicialSize<finalSize
+    //para funcionar é necessario que tenha um FilePath válido
+    // não consegui fazer de uma maneira que todos os passos sejam independentes
+}
+
+Given(~'^the dissertation "([^"]*)" is stored in the system with file name "([^"]*)", has no dissertation entitled "([^"]*)"$') { String title, filename, String newtitle ->
+    article = Dissertacao.findByTitle(title)
+    assert article == null
+
+    TestDataAndOperations.createDissertacao(title, filename, "UFPE")
+    article = Dissertacao.findByTitle(title)
+    assert article != null
+}
+
 Then(~'^I see my user listed as an author member of dissertation by default$') {->
     at DissertationCreate
     userData = Member.findByUsername('admin').id.toString()
@@ -161,6 +175,22 @@ Given(~'^the system has no dissertation stored$')   {->
 }
 
 
+Given(~'^the dissertation "([^"]*)" is stored in the system with file name "([^"]*)", has no dissertation entitled "([^"]*)"$') { String title, filename, String newtitle ->
+    article = Dissertacao.findByTitle(title)
+    assert article == null
+
+    TestDataAndOperations.createDissertacao(title, filename, "UFPE")
+    article = Dissertacao.findByTitle(title)
+    assert article != null
+}
+    inicialSize = Dissertacao.findAll().size()
+    TestDataAndOperations.uploadDissertacao(path)
+    finalSize = Dissertacao.findAll().size()
+    assert inicialSize<finalSize
+    //para funcionar é necessario que tenha um FilePath válido
+    // não consegui fazer de uma maneira que todos os passos sejam independentes
+}
+
 Given(~'^the dissertation "([^"]*)" is stored in the system with file name "([^"]*)", has no dissertation entitled "([^"]*)"$') { String title, filename, String newtitle ->
     article = Dissertacao.findByTitle(title)
     assert article == null