Skip to content

Commit 9d7203f

Browse files
Drop old RSpec support
1 parent d094adc commit 9d7203f

File tree

10 files changed

+3
-708
lines changed

10 files changed

+3
-708
lines changed

rspec-maven-plugin/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@
2020
<executions>
2121
<execution>
2222
<id>integration-test-no-pom</id>
23-
<configuration>
24-
<pomExcludes>
25-
<pomExclude>rspec1-no-pom/pom.xml</pomExclude>
26-
</pomExcludes>
27-
</configuration>
2823
</execution>
2924
</executions>
3025
</plugin>

rspec-maven-plugin/src/it/rspec-path/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<dependency>
1919
<groupId>rubygems</groupId>
2020
<artifactId>rspec</artifactId>
21-
<version>2.11.0</version>
21+
<version>3.10.0</version>
2222
<type>gem</type>
2323
<scope>test</scope>
2424
</dependency>

rspec-maven-plugin/src/it/without-specs-path/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<dependency>
1919
<groupId>rubygems</groupId>
2020
<artifactId>rspec</artifactId>
21-
<version>2.7.0</version>
21+
<version>3.10.0</version>
2222
<type>gem</type>
2323
<scope>test</scope>
2424
</dependency>

rspec-maven-plugin/src/main/java/de/saumya/mojo/rspec/RSpecMavenTestScriptFactory.java

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,28 +24,12 @@ protected void getRunnerScript(StringBuilder builder) {
2424
builder.append("require %q(rspec/core/formatters/html_formatter)\n");
2525
builder.append("\n");
2626

27-
builder.append("if RSpec::Core::Formatters.respond_to? :register\n");
28-
29-
builder.append(" require %q(de/saumya/mojo/rspec/rspec3/maven_surefire_reporter)\n");
27+
builder.append("require %q(de/saumya/mojo/rspec/rspec3/maven_surefire_reporter)\n");
3028
builder.append("::RSpec.configure do |config|\n");
3129
builder.append(" config.add_formatter RSpec::Core::Formatters::ProgressFormatter\n");
3230
builder.append(" config.add_formatter RSpec::Core::Formatters::HtmlFormatter, File.open( \"#{REPORT_PATH}\", 'w' )\n");
3331
builder.append(" config.add_formatter MavenSurefireReporter\n");
3432
builder.append("end\n");
35-
builder.append("else\n");
36-
37-
builder.append(" require %q(de/saumya/mojo/rspec/rspec2/multi_formatter)\n");
38-
builder.append(" require %q(de/saumya/mojo/rspec/rspec2/maven_console_progress_formatter)\n");
39-
builder.append(" require %q(de/saumya/mojo/rspec/rspec2/maven_surefire_reporter)\n");
40-
builder.append(" require %q(de/saumya/mojo/rspec/rspec2/monkey_patch)\n");
41-
builder.append("::MultiFormatter.formatters << [ MavenConsoleProgressFormatter, nil ]\n");
42-
builder.append("::MultiFormatter.formatters << [ MavenSurefireReporter, \"#{TARGET_DIR}\" ] \n");
43-
builder.append("::MultiFormatter.formatters << [ RSpec::Core::Formatters::HtmlFormatter, File.open( \"#{REPORT_PATH}\", 'w' ) ] \n");
44-
builder.append("\n");
45-
builder.append("::RSpec.configure do |config|\n");
46-
builder.append(" config.formatter = ::MultiFormatter\n");
47-
builder.append("end\n");
48-
builder.append("end\n");
4933
builder.append("\n");
5034
builder.append("::RSpec::Core::Runner.disable_autorun!\n");
5135
builder.append("RESULT = ::RSpec::Core::Runner.run( run_args, STDERR, STDOUT)\n");

rspec-maven-plugin/src/main/ruby/de/saumya/mojo/rspec/rspec1/maven_console_progress_formatter.rb

Lines changed: 0 additions & 99 deletions
This file was deleted.

rspec-maven-plugin/src/main/ruby/de/saumya/mojo/rspec/rspec1/maven_surefire_reporter.rb

Lines changed: 0 additions & 196 deletions
This file was deleted.

0 commit comments

Comments
 (0)